Mercurial > hg
comparison tests/test-histedit-non-commute-abort.t @ 21541:6062593d8b06
resolve: don't abort resolve -l even when no merge is in progress
This broke some internal automation that was quite reasonably checking for
unresolved files as a way to determine whether a merge happened cleanly. We
still abort for resolve --mark etc.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 23 May 2014 13:10:31 -0700 |
| parents | 4e932dc5c113 |
| children | a8e6897dffbe |
comparison
equal
deleted
inserted
replaced
| 21539:0c4077905932 | 21541:6062593d8b06 |
|---|---|
| 83 $ hg histedit --abort 2>&1 | fixbundle | 83 $ hg histedit --abort 2>&1 | fixbundle |
| 84 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 84 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 85 | 85 |
| 86 log after abort | 86 log after abort |
| 87 $ hg resolve -l | 87 $ hg resolve -l |
| 88 abort: resolve command not applicable when not merging | |
| 89 [255] | |
| 90 $ hg log --graph | 88 $ hg log --graph |
| 91 @ changeset: 6:bfa474341cc9 | 89 @ changeset: 6:bfa474341cc9 |
| 92 | tag: tip | 90 | tag: tip |
| 93 | user: test | 91 | user: test |
| 94 | date: Thu Jan 01 00:00:00 1970 +0000 | 92 | date: Thu Jan 01 00:00:00 1970 +0000 |