Mercurial > hg-stable
comparison tests/test-resolve @ 8167:6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 14:29:02 +0200 |
parents | 9f73bddb9d0b |
children | 51021f4c80b5 |
comparison
equal
deleted
inserted
replaced
8166:56719b1aa6f4 | 8167:6c82beaaa11a |
---|---|
4 | 4 |
5 hg init repo | 5 hg init repo |
6 cd repo | 6 cd repo |
7 | 7 |
8 echo foo > file | 8 echo foo > file |
9 hg commit -Am 'add file' -d '0 0' | 9 hg commit -Am 'add file' |
10 | 10 |
11 echo bar >> file | 11 echo bar >> file |
12 hg commit -Am 'append bar' -d '0 0' | 12 hg commit -Am 'append bar' |
13 | 13 |
14 echo % create a second head | 14 echo % create a second head |
15 hg up -C 0 | 15 hg up -C 0 |
16 echo baz >> file | 16 echo baz >> file |
17 hg commit -Am 'append baz' -d '0 0' | 17 hg commit -Am 'append baz' |
18 | 18 |
19 echo % failing merge | 19 echo % failing merge |
20 HGMERGE=internal:fail hg merge | 20 HGMERGE=internal:fail hg merge |
21 | 21 |
22 echo resolved > file | 22 echo resolved > file |
23 hg resolve -m file | 23 hg resolve -m file |
24 hg commit -m 'resolved' -d '0 0' | 24 hg commit -m 'resolved' |
25 | 25 |
26 echo % resolve -l, should be empty | 26 echo % resolve -l, should be empty |
27 hg resolve -l | 27 hg resolve -l |