Bazaar

  1. Bug #6634
  2. Comment #1

Comment 1 for bug 6634

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 6634] bzr merge not merging w/o specified branch

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

hunmonk wrote:
| it tells me that it's using the saved location. the path of the saved
| location is correct, however bzr ends w/ 'nothing to do', even when
| there are revs to merge
|
| however, when i specify the location explicitly (in my case: bzr merge
| ../head), then bzr does perform a proper merge.
|
| i have checked very carefully, and i'm certain the saved location and
| the location i specify are the same.

We determine the location to merge from before we determine whether
there's anything to do, so if the locations are identical, the result of
the second operation will be identical.

For your case, 'head', './head', and '.../head' would all produce the
behavior you describe. Are you sure it's none of these?

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

iD8DBQFDxGlX0F+nu1YWqI0RAmAzAJ4zlEvAmc5Al0lWkucXN39+g85onACfWVkl
0TrRw1UgugHdngdWNFz8/98=
=YNjH
-----END PGP SIGNATURE-----