| changeset 4726 | f6e961c0155b |
| parent 4361 | 46280c004f22 |
| 4725:cf8b8f62688a | 4726:f6e961c0155b |
|---|---|
1 #!/bin/sh |
1 #!/bin/sh |
2 |
2 |
3 HGMERGE=true; export HGMERGE |
3 HGMERGE=true; export HGMERGE |
4 |
4 |
5 echo '# basic operation' |
|
6 hg init basic |
5 hg init basic |
7 cd basic |
6 cd basic |
7 |
|
8 echo '# should complain' |
|
9 hg backout |
|
10 hg backout -r 0 0 |
|
11 |
|
12 echo '# basic operation' |
|
8 echo a > a |
13 echo a > a |
9 hg commit -d '0 0' -A -m a |
14 hg commit -d '0 0' -A -m a |
10 echo b >> a |
15 echo b >> a |
11 hg commit -d '1 0' -m b |
16 hg commit -d '1 0' -m b |
12 |
17 |