Merge progress

[Aaron Bentley]

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

Harri Salokorpi wrote:

| $ bzr merge ../other at 154:157
|
| or something similar.
|
| This would help to reduce typing in case you are merging from
unregistered
| http-repositories (for example, svn URL's are sometime quite long).

I'm flexible on syntax; I'll adopt whatever syntax is recommended or
commonly used.  Probably that includes revision IDs as well as revnos.
And maybe ../other@ would mean ../other@$(cd ../other; bzr revno)

But when I'm done, I expect the common case to be
bzr merge ../other

That would determine the BASE revision by scanning the cwd and ../other,
and determining who merged who last.

Or even
bzr merge
That would merge from the branch I branched from, or from whatever I
merged from last.

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

iD8DBQFCZsde0F+nu1YWqI0RAqw3AJ4gmAIYQ6Kgf90HT8okgUbXK4SkKwCaA9Lw
eeDP7amKDA7zbhPrYA6ctrk=
=jXpB
-----END PGP SIGNATURE-----