This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8577

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

Authored by charlesetc on May 22 2020, 3:36 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

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

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

charlesetc created this revision.May 22 2020, 3:36 PM
charlesetc added a comment.May 22 2020, 3:42 PM

I expected these two commits (D8577 and D8578) to be in the same Phabricator "Diff", but it seems like there are two. Let me know if I should merge the two diffs or fold the commits together!

charlesetc retitled this revision from graft-state: add test to document problem with graft --continue, after graft --base to graft-state: add test to document problem with graft --continue, after --base.May 22 2020, 3:53 PM
marmoute added a subscriber: marmoute.May 26 2020, 9:44 AM

I think you can simply fold them and run phab send again.

marmoute accepted this revision.May 26 2020, 10:05 AM
charlesetc added a comment.May 26 2020, 11:15 AM

Awesome I did the fold and D8578 now contains all the changes. Should this diff be closed now?

marmoute added a comment.May 26 2020, 11:49 AM
In D8577#128092, @charlesetc wrote:

Awesome I did the fold and D8578 now contains all the changes. Should this diff be closed now?

yes abandon it.

durin42 added a subscriber: durin42.May 26 2020, 12:12 PM

I don't see the changes as having been folded: there are changes in 8578 that aren't here. Missed a phabsend maybe?

charlesetc abandoned this revision.May 26 2020, 12:53 PM

Yeah I think D8578 is the source of truth now and contains all the changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-graft.t (21 lines)

Diff 21464

tests/test-graft.t

$ hg resolve -m a $ hg resolve -m a
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft -c $ hg graft -c
grafting 24:2e7ea477be26 "24" grafting 24:2e7ea477be26 "24"
$ cat a $ cat a
abc 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 Continue testing same origin policy, using revision numbers from test above
but do some destructive editing of the repo: but do some destructive editing of the repo:
$ hg up -qC 7 $ hg up -qC 7
$ hg tag -l -r 13 tmp $ hg tag -l -r 13 tmp
$ hg --config extensions.strip= strip 2 $ hg --config extensions.strip= strip 2
saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg
$ hg graft tmp $ hg graft tmp