Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-command-template @ 4842:3cf94964c56b
hg log: Move filtering implicit parents to own method and use it in templater.
Extended test repo in test-command-template to contain changeset to test this.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 08 Jul 2007 12:52:08 +0200 |
parents | 5e857d72d3ac |
children |
comparison
equal
deleted
inserted
replaced
4841:f3f84d5cd268 | 4842:3cf94964c56b |
---|---|
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 |