Show More
@@ -3364,6 +3364,8 b' def clearunfinished(repo):' | |||||
3364 | util.unlink(repo.join(f)) |
|
3364 | util.unlink(repo.join(f)) | |
3365 |
|
3365 | |||
3366 | afterresolvedstates = [ |
|
3366 | afterresolvedstates = [ | |
|
3367 | ('graftstate', | |||
|
3368 | _('hg graft --continue')), | |||
3367 | ] |
|
3369 | ] | |
3368 |
|
3370 | |||
3369 | def checkafterresolved(repo): |
|
3371 | def checkafterresolved(repo): |
@@ -246,6 +246,7 b' Fix up:' | |||||
246 | $ echo b > e |
|
246 | $ echo b > e | |
247 | $ hg resolve -m e |
|
247 | $ hg resolve -m e | |
248 | (no more unresolved files) |
|
248 | (no more unresolved files) | |
|
249 | continue: hg graft --continue | |||
249 |
|
250 | |||
250 | Continue with a revision should fail: |
|
251 | Continue with a revision should fail: | |
251 |
|
252 | |||
@@ -440,6 +441,7 b' Resolve conflicted graft' | |||||
440 | $ echo b > a |
|
441 | $ echo b > a | |
441 | $ hg resolve -m a |
|
442 | $ hg resolve -m a | |
442 | (no more unresolved files) |
|
443 | (no more unresolved files) | |
|
444 | continue: hg graft --continue | |||
443 | $ hg graft -c |
|
445 | $ hg graft -c | |
444 | grafting 1:5d205f8b35b6 "1" |
|
446 | grafting 1:5d205f8b35b6 "1" | |
445 | $ hg export tip --git |
|
447 | $ hg export tip --git | |
@@ -469,6 +471,7 b' Resolve conflicted graft with rename' | |||||
469 | $ hg resolve --all |
|
471 | $ hg resolve --all | |
470 | merging a and b to b |
|
472 | merging a and b to b | |
471 | (no more unresolved files) |
|
473 | (no more unresolved files) | |
|
474 | continue: hg graft --continue | |||
472 | $ hg graft -c |
|
475 | $ hg graft -c | |
473 | grafting 2:5c095ad7e90f "2" |
|
476 | grafting 2:5c095ad7e90f "2" | |
474 | $ hg export tip --git |
|
477 | $ hg export tip --git | |
@@ -759,6 +762,7 b' graft --continue after --force' | |||||
759 | $ echo abc > a |
|
762 | $ echo abc > a | |
760 | $ hg resolve -m a |
|
763 | $ hg resolve -m a | |
761 | (no more unresolved files) |
|
764 | (no more unresolved files) | |
|
765 | continue: hg graft --continue | |||
762 | $ hg graft -c |
|
766 | $ hg graft -c | |
763 | grafting 28:50a516bb8b57 "28" |
|
767 | grafting 28:50a516bb8b57 "28" | |
764 | $ cat a |
|
768 | $ cat a |
@@ -78,6 +78,7 b' http://bz.selenic.com/show_bug.cgi?id=44' | |||||
78 | $ echo b3 >> b |
|
78 | $ echo b3 >> b | |
79 | $ hg resolve --mark b |
|
79 | $ hg resolve --mark b | |
80 | (no more unresolved files) |
|
80 | (no more unresolved files) | |
|
81 | continue: hg graft --continue | |||
81 |
$ |
|
82 | $ hg graft --continue | |
82 | grafting 1:5974126fad84 "b1" |
|
83 | grafting 1:5974126fad84 "b1" | |
83 | warning: can't find ancestor for 'b' copied from 'a'! |
|
84 | warning: can't find ancestor for 'b' copied from 'a'! |
General Comments 0
You need to be logged in to leave comments.
Login now