Patchwork D8577: graft-state: add test to document problem with graft --continue, after graft --base

login
register
mail settings
Submitter phabricator
Date May 22, 2020, 7:36 p.m.
Message ID <differential-rev-PHID-DREV-msctzikizugtj5lftwbd-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46367/
State Superseded
Headers show

Comments

phabricator - May 22, 2020, 7:36 p.m.
charlesetc created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Instead of remembering the --base from the initial graft call, graft --continue
  errors, complaining that the revision is ungraftable. Fix to follow.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D8577

AFFECTED FILES
  tests/test-graft.t

CHANGE DETAILS




To: charlesetc, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -853,6 +853,27 @@ 
   $ cat a
   abc
 
+graft --continue after --base with conflits
+
+  $ echo base > d
+  $ hg ci -m _
+  $ hg graft -r 6
+  skipping ungraftable merge revision 6
+  [255]
+  $ hg graft -r 6 --base 5
+  grafting 6:25a2b029d3ae "6"
+  merging d
+  merging e
+  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
+  abort: unresolved conflicts, can't continue
+  (use 'hg resolve' and 'hg graft --continue')
+  [1]
+  $ echo a > d && hg resolve -qm
+  continue: hg graft --continue
+  $ hg graft --continue
+  skipping ungraftable merge revision 6
+  [255]
+
 Continue testing same origin policy, using revision numbers from test above
 but do some destructive editing of the repo: