Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
6932:d557749c627a | 6933:17bdcd59b9ad |
---|---|
299 echo % hgweb filediff | 299 echo % hgweb filediff |
300 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw') | 300 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw') |
301 echo % errors encountered | 301 echo % errors encountered |
302 cat errors.log | 302 cat errors.log |
303 | 303 |
304 echo % merge/resolve | |
305 echo '$Id$' > m | |
306 hg add m | |
307 hg commit -m 4kw | |
308 echo foo >> m | |
309 hg commit -m 5foo | |
310 echo % simplemerge | |
311 hg update 4 | |
312 echo foo >> m | |
313 hg commit -m 6foo | |
314 hg merge | |
315 hg commit -m simplemerge | |
316 cat m | |
317 echo % conflict | |
318 hg update 4 | |
319 echo bar >> m | |
320 hg commit -m 8bar | |
321 hg merge | |
322 echo % keyword stays outside conflict zone | |
323 cat m | |
324 echo % resolve to local | |
325 HGMERGE=internal:local hg resolve | |
326 hg commit -m localresolve | |
327 cat m | |
328 | |
304 echo % switch off expansion | 329 echo % switch off expansion |
305 echo % kwshrink with unknown file u | 330 echo % kwshrink with unknown file u |
306 cp a u | 331 cp a u |
307 hg --verbose kwshrink | 332 hg --verbose kwshrink |
308 echo % cat | 333 echo % cat |