This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3663

graft: add test showing --continue not preserving --edit passed earlier
Needs RevisionPublic

Authored by pulkit on May 25 2018, 6:25 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

Right now, if you run hg graft --edit, face some conflicts, resolve them and
then run hg graft --continue, you will see graft no longer pops up for the
editor and you hate mercurial for not remembering arguments you passed earlier.

Upcoming patch will fix this buggy behavior and this test will help us in
realizing those changes.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.May 25 2018, 6:25 PM
baymax requested changes to this revision.Jan 24 2020, 12:33 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:33 PM

Revision Contents
Changeset List

Diff 8908

tests/test-graft.t

$ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.' $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
@ 11:30c1050a58b2 added c @ 11:30c1050a58b2 added c
| (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3) | (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
o 10:ec7eda2313e2 added b o 10:ec7eda2313e2 added b
| (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6) | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
o 3:9e887f7a939c bar to b o 3:9e887f7a939c bar to b
| |
~ ~
Test that --edit is preserved and reused in `hg graft --continue`
$ hg up '.^^'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ HGEDITOR=cat hg graft -r 1 -r 2 --edit
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')
[255]
$ echo foobar > b
$ hg resolve -m
(no more unresolved files)
continue: hg graft --continue
$ HGEDITOR=cat hg graft --continue
grafting 1:80e6d2c47cfe "added b"
grafting 2:8be98ac1a569 "added c"
$ hg log -Gr '.^^::.'
@ changeset: 13:7ee8d3496b19
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: added c
|
o changeset: 12:802f1eae3af3
| parent: 3:9e887f7a939c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: added b
|
o changeset: 3:9e887f7a939c
| parent: 0:f7ad41964313
~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: bar to b