Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge5.out @ 2395:8ed45fb1053a
remove appendfile for the manifest when adding a changegroup
Since the changelog is using appendfile, the manifest entries cannot
be referenced, so we don't need to use append file for the manifest.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 04 Jun 2006 17:46:33 +0200 |
parents | b2ae81a7df29 |
children | 49988d9f0758 |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2038
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
2 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
|
3 this update spans a branch affecting the following files: |
616 | 4 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
|
5 aborting update spanning branches! |
2038
5c4496ed152d
Tell the user the real "hg update -C" command, not just "-C" when aborting.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
6 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |