Mercurial > hg
comparison tests/test-histedit-no-change.t @ 22895:dfa44e25bb53
dirstate: properly clean-up some more merge state on setparents
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 10 Oct 2014 13:05:50 -0500 |
| parents | aa9385f983fa |
| children | 1ef96a3b8b89 |
comparison
equal
deleted
inserted
replaced
| 22894:c40be72dc177 | 22895:dfa44e25bb53 |
|---|---|
| 179 $ mv .hg/histedit-state-ignore .hg/histedit-state | 179 $ mv .hg/histedit-state-ignore .hg/histedit-state |
| 180 $ hg sum | 180 $ hg sum |
| 181 parent: 0:cb9a9f314b8b | 181 parent: 0:cb9a9f314b8b |
| 182 a | 182 a |
| 183 branch: default | 183 branch: default |
| 184 commit: 1 modified, 1 unknown (new branch head) | 184 commit: 1 added, 1 unknown (new branch head) |
| 185 update: 6 new changesets (update) | 185 update: 6 new changesets (update) |
| 186 hist: 2 remaining (histedit --continue) | 186 hist: 2 remaining (histedit --continue) |
| 187 | 187 |
| 188 $ hg histedit --abort 2>&1 | fixbundle | 188 $ hg histedit --abort 2>&1 | fixbundle |
| 189 [1] | 189 [1] |
| 190 | 190 |
| 191 modified files should survive the abort when we've moved away already | 191 modified files should survive the abort when we've moved away already |
| 192 $ hg st | 192 $ hg st |
| 193 M e | 193 A e |
| 194 ? edit.sh | 194 ? edit.sh |
| 195 | 195 |
| 196 $ graphlog "log after abort" | 196 $ graphlog "log after abort" |
| 197 % log after abort | 197 % log after abort |
| 198 o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" | 198 o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" |