equal
deleted
inserted
replaced
17 hg commit -m 'no person' -d '1200000 0' -u 'other@place' |
17 hg commit -m 'no person' -d '1200000 0' -u 'other@place' |
18 echo c >> c |
18 echo c >> c |
19 hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' |
19 hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' |
20 echo foo > .hg/branch |
20 echo foo > .hg/branch |
21 hg commit -m 'new branch' -d '1400000 0' -u 'person' |
21 hg commit -m 'new branch' -d '1400000 0' -u 'person' |
|
22 hg co -q 3 |
|
23 echo other 4 >> d |
|
24 hg add d |
|
25 hg commit -m 'new head' -d '1500000 0' -u 'person' |
|
26 hg merge -q |
|
27 hg commit -m 'merge' -d '1500001 0' -u 'person' |
22 |
28 |
23 # make sure user/global hgrc does not affect tests |
29 # make sure user/global hgrc does not affect tests |
24 echo '[ui]' > .hg/hgrc |
30 echo '[ui]' > .hg/hgrc |
25 echo 'logtemplate =' >> .hg/hgrc |
31 echo 'logtemplate =' >> .hg/hgrc |
26 echo 'style =' >> .hg/hgrc |
32 echo 'style =' >> .hg/hgrc |