equal
deleted
inserted
replaced
23 echo other 4 >> d |
23 echo other 4 >> d |
24 hg add d |
24 hg add d |
25 hg commit -m 'new head' -d '1500000 0' -u 'person' |
25 hg commit -m 'new head' -d '1500000 0' -u 'person' |
26 hg merge -q |
26 hg merge -q |
27 hg commit -m 'merge' -d '1500001 0' -u 'person' |
27 hg commit -m 'merge' -d '1500001 0' -u 'person' |
|
28 # second branch starting at nullrev |
|
29 hg update null |
|
30 echo second > second |
|
31 hg add second |
|
32 hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' |
28 |
33 |
29 # make sure user/global hgrc does not affect tests |
34 # make sure user/global hgrc does not affect tests |
30 echo '[ui]' > .hg/hgrc |
35 echo '[ui]' > .hg/hgrc |
31 echo 'logtemplate =' >> .hg/hgrc |
36 echo 'logtemplate =' >> .hg/hgrc |
32 echo 'style =' >> .hg/hgrc |
37 echo 'style =' >> .hg/hgrc |