pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY This patch shows that when we do `hg graft --continue`, the value of --log flag passed when initial graft was run was not used. Next patch will fix this and tests will help us in realising that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3661 AFFECTED FILES tests/test-graft.t CHANGE DETAILS diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -1536,3 +1536,32 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: bar to b +Test that --log is preserved and reused in `hg graft --continue` + + $ hg up '.^^' + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg graft -r 1 -r 2 --log + grafting 1:80e6d2c47cfe "added b" + merging b + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') + abort: unresolved conflicts, can't continue + (use 'hg resolve' and 'hg graft --continue --log') + [255] + + $ echo foobar > b + $ hg resolve -m + (no more unresolved files) + continue: hg graft --continue + + $ hg graft --continue + grafting 1:80e6d2c47cfe "added b" + grafting 2:8be98ac1a569 "added c" + + $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.' + @ 11:7ee8d3496b19 added c + | + o 10:802f1eae3af3 added b + | + o 3:9e887f7a939c bar to b + | + ~ To: pulkit, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel