aaron.bentley at utoronto.ca
Wed Apr 20 22:19:26 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
Harri Salokorpi wrote:
| $ bzr merge ../other at 154:157
| or something similar.
| This would help to reduce typing in case you are merging from
| 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.
That would merge from the branch I branched from, or from whatever I
merged from last.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar