[PATCH] Updated status --short patch with tests

Aaron Bentley aaron.bentley at utoronto.ca
Thu Nov 23 19:26:02 GMT 2006


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

Keir Mierle wrote:
> I've updated the patch I sent the other day [1] to have tests.

Did you mean to attach the updated patch?

> I'm not even sure what an inner merge is.

When you do a merge, you get not only the changes introduced by the
revision you're merging, but the changes from all the ancestors of that
revision which are not ancestors of the last-committed revision.

These indirectly-merged revisions are listed as "inner merges" by the
status output, which causes them to be indented.

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

iD8DBQFFZfXK0F+nu1YWqI0RAtjeAJ9l6+UlsqBmB63PwZUD9+2eyMDeDwCfZtRx
+njWut/E05jJl+0pnkAxDOs=
=yqee
-----END PGP SIGNATURE-----




More information about the bazaar mailing list