Mercurial > hg
comparison tests/test-histedit-fold-non-commute.t @ 27627:dcbba68e076f
histedit: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:41:17 +0000 |
| parents | 11be6b7f95da |
| children | e7ff83b2bcfe |
comparison
equal
deleted
inserted
replaced
| 27626:157675d0f600 | 27627:dcbba68e076f |
|---|---|
| 93 | 93 |
| 94 fix up | 94 fix up |
| 95 $ echo 'I can haz no commute' > e | 95 $ echo 'I can haz no commute' > e |
| 96 $ hg resolve --mark e | 96 $ hg resolve --mark e |
| 97 (no more unresolved files) | 97 (no more unresolved files) |
| 98 continue: hg histedit --continue | |
| 98 $ cat > cat.py <<EOF | 99 $ cat > cat.py <<EOF |
| 99 > import sys | 100 > import sys |
| 100 > print open(sys.argv[1]).read() | 101 > print open(sys.argv[1]).read() |
| 101 > print | 102 > print |
| 102 > print | 103 > print |
| 126 | 127 |
| 127 just continue this time | 128 just continue this time |
| 128 $ hg revert -r 'p1()' e | 129 $ hg revert -r 'p1()' e |
| 129 $ hg resolve --mark e | 130 $ hg resolve --mark e |
| 130 (no more unresolved files) | 131 (no more unresolved files) |
| 132 continue: hg histedit --continue | |
| 131 $ hg histedit --continue 2>&1 | fixbundle | 133 $ hg histedit --continue 2>&1 | fixbundle |
| 132 7b4e2f4b7bcd: empty changeset | 134 7b4e2f4b7bcd: empty changeset |
| 133 | 135 |
| 134 log after edit | 136 log after edit |
| 135 $ hg log --graph | 137 $ hg log --graph |
| 253 | 255 |
| 254 fix up | 256 fix up |
| 255 $ echo 'I can haz no commute' > e | 257 $ echo 'I can haz no commute' > e |
| 256 $ hg resolve --mark e | 258 $ hg resolve --mark e |
| 257 (no more unresolved files) | 259 (no more unresolved files) |
| 260 continue: hg histedit --continue | |
| 258 $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' | 261 $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
| 259 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 262 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 260 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 261 merging e | 264 merging e |
| 262 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 265 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 264 | 267 |
| 265 just continue this time | 268 just continue this time |
| 266 $ hg revert -r 'p1()' e | 269 $ hg revert -r 'p1()' e |
| 267 $ hg resolve --mark e | 270 $ hg resolve --mark e |
| 268 (no more unresolved files) | 271 (no more unresolved files) |
| 272 continue: hg histedit --continue | |
| 269 $ hg histedit --continue 2>&1 | fixbundle | 273 $ hg histedit --continue 2>&1 | fixbundle |
| 270 7b4e2f4b7bcd: empty changeset | 274 7b4e2f4b7bcd: empty changeset |
| 271 | 275 |
| 272 log after edit | 276 log after edit |
| 273 $ hg log --graph | 277 $ hg log --graph |