Mercurial > hg
view tests/test-pull-r @ 6933:17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 22 Aug 2008 08:26:18 +0200 |
parents | b8346ae5d64b |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo foo > foo hg ci -qAm 'add foo' -d '0 0' echo >> foo hg ci -m 'change foo' -d '0 0' hg up -qC 0 echo bar > bar hg ci -qAm 'add bar' -d '0 0' hg log cd .. hg init copy cd copy echo '% pull a missing revision' hg pull -qr missing ../repo echo '% pull -r 0' hg pull -qr 0 ../repo hg log echo '% pull -r 1' hg pull -qr 1 ../repo hg log # this used to abort: received changelog group is empty echo '% pull -r 1 again' hg pull -qr 1 ../repo