Mercurial > hg
comparison tests/test-histedit-non-commute-abort.t @ 24643:a8e6897dffbe
graft: allow creating sibling grafts
Previously it was impossible to graft a commit onto it's own parent (i.e. create
a copy of the commit). This is useful when wanting to create a backup of the
commit before continuing to amend it. This patch enables that behavior.
The change to the histedit test is because histedit uses graft to apply commits.
The test in question moves a commit backwards onto an ancestor. Since the graft
logic now more explicitly supports this, it knows to simply accept the incoming
changes (since they are more recent), instead of prompting.
author | Durham Goode <durham@fb.com> |
---|---|
date | Sun, 05 Apr 2015 11:55:38 -0700 |
parents | 6062593d8b06 |
children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
24642:54e5c239c2d9 | 24643:a8e6897dffbe |
---|---|
68 > pick bfa474341cc9 does not commute with e | 68 > pick bfa474341cc9 does not commute with e |
69 > pick e860deea161a e | 69 > pick e860deea161a e |
70 > pick 652413bf663e f | 70 > pick 652413bf663e f |
71 > EOF | 71 > EOF |
72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
73 remote changed e which local deleted | |
74 use (c)hanged version or leave (d)eleted? c | |
75 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 merging e | 74 merging e |
77 warning: conflicts during merge. | 75 warning: conflicts during merge. |
78 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | 76 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
79 Fix up the change and run hg histedit --continue | 77 Fix up the change and run hg histedit --continue |