Mercurial > hg
comparison tests/test-histedit-non-commute.t @ 24767:477e76936b1d
histedit: convert pick action into a class
This converts the pick action into a histeditclass instance, as part of an
ongoing effort to refactor histedit for maintainability and robustness.
The test output changed because previously pick would only report the commit
disappearing if there were no merge conflicts. Now that we've unified the normal
and the --continue flows, they act the same and we get the warning even after
--continue.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Sat, 04 Apr 2015 11:39:08 -0700 |
| parents | b081decd9062 |
| children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
| 24766:cfb8f5e3ca49 | 24767:477e76936b1d |
|---|---|
| 168 just continue this time | 168 just continue this time |
| 169 $ hg revert -r 'p1()' e | 169 $ hg revert -r 'p1()' e |
| 170 $ hg resolve --mark e | 170 $ hg resolve --mark e |
| 171 (no more unresolved files) | 171 (no more unresolved files) |
| 172 $ hg histedit --continue 2>&1 | fixbundle | 172 $ hg histedit --continue 2>&1 | fixbundle |
| 173 7b4e2f4b7bcd: empty changeset | |
| 173 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 175 | 176 |
| 176 log after edit | 177 log after edit |
| 177 $ hg log --graph | 178 $ hg log --graph |
| 251 second edit also fails, but just continue | 252 second edit also fails, but just continue |
| 252 $ hg revert -r 'p1()' e | 253 $ hg revert -r 'p1()' e |
| 253 $ hg resolve --mark e | 254 $ hg resolve --mark e |
| 254 (no more unresolved files) | 255 (no more unresolved files) |
| 255 $ hg histedit --continue 2>&1 | fixbundle | 256 $ hg histedit --continue 2>&1 | fixbundle |
| 257 7b4e2f4b7bcd: empty changeset | |
| 256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 258 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 259 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 258 | 260 |
| 259 post message fix | 261 post message fix |
| 260 $ hg log --graph | 262 $ hg log --graph |