bzr merge not merging w/o specified branch

[hunmonk]

i have a branch that i frequently merge w/ another, and it's the only branch that i merge.

when i do this from inside the branch that i want to merge into: bzr merge

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.

[Aaron Bentley (abentley)]

-----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-----

[hunmonk (chad-apartmentlines)]

from inside my branch i ran 'touch ../head/FILE'

then i went to the exact location given in the 'using saved location', and FILE is in there. i'm pretty sure it's the same location.

[Aaron Bentley (abentley)]

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

hunmonk wrote:
| Public bug report changed:
| https://launchpad.net/malone/bugs/6634
|
| Comment:
| from inside my branch i ran 'touch ../head/FILE'
|
| then i went to the exact location given in the 'using saved location',
| and FILE is in there. i'm pretty sure it's the same location.

I can't reproduce your problem. Here's what I tried:
abentley@lappy:~$ cp bzr.ab bzr.testparent -r
abentley@lappy:~$ cd bzr.testparent/
abentley@lappy:~/bzr.testparent$ bzr pull ../bzr.ab --remember
0 revision(s) pulled.
abentley@lappy:~/bzr.testparent$ echo y|bzr uncommit
~ 1294 Martin Pool 2006-01-06
~ [merge] robertc

The above revision(s) will be removed.
Are you sure [y/N]? abentley@lappy:~/bzr.testparent$ bzr revert
abentley@lappy:~/bzr.testparent$ bzr merge
Using saved location: ../bzr.ab
All changes applied successfully.
abentley@lappy:~/bzr.testparent$
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDxHPL0F+nu1YWqI0RAmt2AKCDC4WX4zMmpUlNxhV4UhOz66pAFgCdEsNA
h97zGCrPC6MQmjTKTGZz160=
=2w9L
-----END PGP SIGNATURE-----

[hunmonk (chad-apartmentlines)]

hm. on my next merge i'll record what happens and post it. maybe that will help

[Aaron Bentley (abentley)]

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

hunmonk wrote:
| Public bug report changed:
| https://launchpad.net/malone/bugs/6634
|
| Comment:
| hm. on my next merge i'll record what happens and post it. maybe that
| will help

If you could determine how to reproduce the problem, that would be the
most helpful thing.

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

iD8DBQFDxIUA0F+nu1YWqI0RAvRiAJ9T/NFCxW1ImIrJ9XQ5TEJbmpHMdgCeOAu5
53JSkfb9PlPQeP5BmeMAHhI=
=gYf0
-----END PGP SIGNATURE-----

[hunmonk (chad-apartmentlines)]

ok, here's a printout of the exact procedure i'm using, which illustrates the problem. as i said previously, i've tested that the saved location and the ../head relative path that i use are the same branch:

Owner@Chug ~
$ cd /bzr/head

Owner@Chug /bzr/head
$ bzr pull
Using saved location: http://drupal.revisioncontrol.net/core/head
All changes applied successfully.
4 revision(s) pulled.

Owner@Chug /bzr/head
$ cd ../undo

Owner@Chug /bzr/undo
$ bzr merge
Using saved location: C:\Program Files\Apache Group\Apache2\htdocs\drupal\cvs.dr
upal.org\bzr\head
Nothing to do.

Owner@Chug /bzr/undo
$ bzr merge ../head
All changes applied successfully.

[Robert Collins (lifeless)]

Does 'bzr merge C:\Program Files\Apache Group\Apache2\htdocs\drupal\cvs.drupal.org\bzr\head' work ?

Is there any chance that '../head' and the C:... path given above are -not- the same? Do you have cygwin for instance ? What does 'mount' show ?

[hunmonk (chad-apartmentlines)]

at the time i posted this bug i was using cygwin, yes. haven't had the same prob on other systems.

[Martin Pool (mbp)]

Still needs info to isolate? Possibly a cygwin-related path bug?

[John A Meinel (jameinel)]

I believe this has been fixed. It is possible that it was a confusion between the win32 bzr and the cygwin bzr (which would have expected different absolute paths).
But the latest code will save a relative path for 'parent', so merging should work with either client on the same filesystem.

If the bug can be reproduced, we can re-open this bug.