Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 766:b444a7e053f1
Get addremove to use new walk code.
It is now more verbose than it used to be. If given file names, it
prints nothing, as before. But if given patterns or nothing, it prints
the names of the files it is operating on, to remove that air of mystery.
It also now operates at or below the current directory.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri, 22 Jul 2005 19:45:48 -0800 |
| parents | 7e4843b7efd2 |
| children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
| rev | line source |
|---|---|
| 346 | 1 + hg init |
| 2 + echo nothing | |
| 3 + hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
748
diff
changeset
|
4 + hg commit -m ancestor -d '0 0' |
| 346 | 5 + echo something |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
748
diff
changeset
|
6 + hg commit -m branch1 -d '0 0' |
| 346 | 7 + hg co 0 |
| 8 + echo 'something else' | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
748
diff
changeset
|
9 + hg commit -m branch2 -d '0 0' |
| 346 | 10 + export HGMERGE=merge |
| 11 + HGMERGE=merge | |
| 591 | 12 + hg up -m 1 |
| 346 | 13 merge: warning: conflicts during merge |
| 14 merging a | |
| 15 merging a failed! | |
| 16 + hg id | |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
17 32e80765d7fe+75234512624c+ tip |
| 392 | 18 + grep -Ev '>>>|<<<' a |
| 346 | 19 something else |
| 20 ======= | |
| 21 something | |
| 22 + hg status | |
| 748 | 23 M a |
| 346 | 24 ? .out |