Show More
@@ -94,7 +94,7 b" nokwcommands = ('add addremove annotate " | |||||
94 |
|
94 | |||
95 | # hg commands that trigger expansion only when writing to working dir, |
|
95 | # hg commands that trigger expansion only when writing to working dir, | |
96 | # not when reading filelog, and unexpand when reading from working dir |
|
96 | # not when reading filelog, and unexpand when reading from working dir | |
97 | restricted = 'record qfold qimport qnew qpush qrefresh qrecord' |
|
97 | restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord' | |
98 |
|
98 | |||
99 | def utcdate(date): |
|
99 | def utcdate(date): | |
100 | '''Returns hgdate in cvs-like UTC format.''' |
|
100 | '''Returns hgdate in cvs-like UTC format.''' |
@@ -301,6 +301,31 b' echo % hgweb filediff' | |||||
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 |
@@ -437,9 +437,36 b' 200 Script output follows' | |||||
437 |
|
437 | |||
438 |
|
438 | |||
439 | % errors encountered |
|
439 | % errors encountered | |
|
440 | % merge/resolve | |||
|
441 | % simplemerge | |||
|
442 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
443 | created new head | |||
|
444 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
445 | (branch merge, don't forget to commit) | |||
|
446 | $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ | |||
|
447 | foo | |||
|
448 | % conflict | |||
|
449 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
450 | created new head | |||
|
451 | merging m | |||
|
452 | warning: conflicts during merge. | |||
|
453 | merging m failed! | |||
|
454 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
455 | use 'hg resolve' to retry unresolved file merges | |||
|
456 | % keyword stays outside conflict zone | |||
|
457 | $Id$ | |||
|
458 | <<<<<<< local | |||
|
459 | bar | |||
|
460 | ======= | |||
|
461 | foo | |||
|
462 | >>>>>>> other | |||
|
463 | % resolve to local | |||
|
464 | $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ | |||
|
465 | bar | |||
440 | % switch off expansion |
|
466 | % switch off expansion | |
441 | % kwshrink with unknown file u |
|
467 | % kwshrink with unknown file u | |
442 | overwriting a shrinking keywords |
|
468 | overwriting a shrinking keywords | |
|
469 | overwriting m shrinking keywords | |||
443 | overwriting x/a shrinking keywords |
|
470 | overwriting x/a shrinking keywords | |
444 | % cat |
|
471 | % cat | |
445 | expand $Id$ |
|
472 | expand $Id$ |
General Comments 0
You need to be logged in to leave comments.
Login now