Mercurial > public > mercurial-scm > hg
diff tests/test-keyword @ 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 | 959113c5e1cd |
| children | e981725da3fe |
line wrap: on
line diff
--- a/tests/test-keyword Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-keyword Fri Aug 22 08:26:18 2008 +0200 @@ -301,6 +301,31 @@ echo % errors encountered cat errors.log +echo % merge/resolve +echo '$Id$' > m +hg add m +hg commit -m 4kw +echo foo >> m +hg commit -m 5foo +echo % simplemerge +hg update 4 +echo foo >> m +hg commit -m 6foo +hg merge +hg commit -m simplemerge +cat m +echo % conflict +hg update 4 +echo bar >> m +hg commit -m 8bar +hg merge +echo % keyword stays outside conflict zone +cat m +echo % resolve to local +HGMERGE=internal:local hg resolve +hg commit -m localresolve +cat m + echo % switch off expansion echo % kwshrink with unknown file u cp a u