'merge' merged

[Aaron Bentley]

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

Erik Bågfors wrote:
> Now I feel really stupid. But how do I specify base?
> 
> 
> As you can see revno 2 are the last merge (or.. the cp -a :) )
> 
> Then I have tried
> : [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 at 2 . at 2
> : [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 . at 2
> : [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 @2
> and finaly 
> : [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 .
> which worked but overwrote rev 3 in the current tree.

The syntax is "bzr merge ../repo1 ./@2".  You can also do "bzr merge
../repo1 ../repo1/@2", of course.

To get back the changes you just accidentally lost, you can do

"bzr merge ./@ ."

HTH,

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

iD8DBQFCh5m+0F+nu1YWqI0RAukcAJ9VbcZ/G3hAK5yPEhx4swbKsHm0owCfX+E3
Hef81kpvG6lKO0fao2xmMok=
=LmX1
-----END PGP SIGNATURE-----