Bazaar

  1. Bug #34956
  2. Comment #4

Comment 4 for bug 34956

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 34956] Re: Merging 2 branches which create the same directory causes confusion

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John A Meinel wrote:
> $ bzr status
> removed:
> a
> added:
> foo/
> renamed:
> foo => foo.moved
> conflicts:
> Conflict adding file foo. Moved existing file to foo.moved.
> pending merges:
> John Arbash Meinel 2006-07-21 foo

Wait a sec-- why's 'a' listed as removed?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEwUHf0F+nu1YWqI0RAicVAJ9WgizQMD+47FUlyKot8c3gyToRwQCfU//K
xjp2p7uGnMtYgqz42Hil/xE=
=QTNV
-----END PGP SIGNATURE-----