Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 4889:d69b1fb111b9
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 16 Jul 2007 20:15:03 -0700 |
parents | 93a4e72b4f83 |
children |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4361
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2175
diff
changeset
|
2 warning: conflicts during merge. |
346 | 3 merging a |
4 merging a failed! | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
6 There are unresolved merges, you can redo the full merge using: |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
7 hg update -C 2 |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
8 hg merge 1 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
9 e7fe8eb3e180+0d24b7662d3e+ tip |
4385
93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4361
diff
changeset
|
10 <<<<<<< my |
346 | 11 something else |
12 ======= | |
13 something | |
4385
93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4361
diff
changeset
|
14 >>>>>>> other |
748 | 15 M a |