Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge5.out @ 1551:e793cbc8be00
Fixes to "hg heads -r FOO":
Make it actually work (undefined variable 'rev'; allow to pass a rev parameter).
repo.branchlookup() doesn't need a copy of heads because it doesn't modify it.
Use None as default argument to heads() instead of nullid.
Doc string PEPification.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 16 Nov 2005 12:56:19 +0100 |
parents | 5a034646e472 |
children | ced2d3620f95 |
rev | line source |
---|---|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
1 removing b |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
2 this update spans a branch affecting the following files: |
616 | 3 b |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
4 aborting update spanning branches! |
819
77e121a0d870
Update output for test-merge5.
Bryan O'Sullivan <bos@serpentine.com>
parents:
814
diff
changeset
|
5 (use update -m to merge across branches or -C to lose changes) |