Bazaar

  1. Bug #6634
  2. Comment #3

Comment 3 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:
| 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-----