Merge eats memory

[Aaron Bentley]

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

Michael Ellerman wrote:

|>Last-committed revision is generally the
|>desirable thing to merge, but it's harder to do than merging the working
|>tree.
|
|
| I agree. Why is it harder? Because you have to generate the files as
they were
| in that revision?

Actually, I mean "less discoverable" and "harder to type".  I do have to
regenerate the files that differ, but that was abstracted away ages ago,
so I don't really notice.

| Personally I think it's sub-optimal UI for the most obvious command "bzr
| merge ../other" to not do what I expect, which is merge the last commited
| revision. But then I can't think of a good syntax for saying merge
uncommited
| changes.

That's where I'm at, too.

Aaron

- --
Aaron Bentley
www.aaronbentley.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCpSOi0F+nu1YWqI0RAu3+AJ48h6HcxrIT0Bj3x1AWLcDZ5+610wCfeV93
uBs/bh3NXTqN6ig/IVmiplk=
=sMyP
-----END PGP SIGNATURE-----