Mercurial > hg
comparison tests/test-histedit-non-commute.t @ 32057:e5ffc91a2276 stable
histedit: make check for unresolved conflicts explicit (issue5545)
Previously, we'd rely on the implicit check that `localrepo.commit` did.
The problem is that that check only happened when the working copy was
dirty. With a "clean" working copy but unresolved conflicts we'd get
into a broken state.
To fix that, do what rebase does and check for unresolved conflicts at
the start of histedit --continue.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 20 Apr 2017 17:18:08 -0700 |
parents | c100dbd593e2 |
children | 9bc7ec924234 |
comparison
equal
deleted
inserted
replaced
32056:59afb0750aec | 32057:e5ffc91a2276 |
---|---|
159 $ hg histedit --continue 2>&1 | fixbundle | 159 $ hg histedit --continue 2>&1 | fixbundle |
160 merging e | 160 merging e |
161 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 161 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
162 Fix up the change (pick 7b4e2f4b7bcd) | 162 Fix up the change (pick 7b4e2f4b7bcd) |
163 (hg histedit --continue to resume) | 163 (hg histedit --continue to resume) |
164 $ hg histedit --continue 2>&1 | fixbundle | |
165 abort: unresolved merge conflicts (see 'hg help resolve') | |
164 | 166 |
165 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative | 167 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative |
166 former children. | 168 former children. |
167 | 169 |
168 just continue this time | 170 just continue this time |
169 $ hg revert -r 'p1()' e | 171 $ hg revert -r 'p1()' e |
172 make sure the to-be-empty commit doesn't screw up the state (issue5545) | |
173 $ hg histedit --continue 2>&1 | fixbundle | |
174 abort: unresolved merge conflicts (see 'hg help resolve') | |
170 $ hg resolve --mark e | 175 $ hg resolve --mark e |
171 (no more unresolved files) | 176 (no more unresolved files) |
172 continue: hg histedit --continue | 177 continue: hg histedit --continue |
173 $ hg histedit --continue 2>&1 | fixbundle | 178 $ hg histedit --continue 2>&1 | fixbundle |
174 7b4e2f4b7bcd: skipping changeset (no changes) | 179 7b4e2f4b7bcd: skipping changeset (no changes) |