Show More
@@ -184,6 +184,12 b' bisect test' | |||||
184 |
|
184 | |||
185 | $ hg bisect -r |
|
185 | $ hg bisect -r | |
186 | $ hg bisect -b |
|
186 | $ hg bisect -b | |
|
187 | $ hg summary | |||
|
188 | parent: 31:58c80a7c8a40 tip | |||
|
189 | msg 31 | |||
|
190 | branch: default | |||
|
191 | commit: (clean) | |||
|
192 | update: (current) | |||
187 | $ hg bisect -g 1 |
|
193 | $ hg bisect -g 1 | |
188 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) |
|
194 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) | |
189 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
195 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -152,6 +152,14 b' check histedit_source' | |||||
152 | When you are finished, run hg histedit --continue to resume. |
|
152 | When you are finished, run hg histedit --continue to resume. | |
153 | $ hg status |
|
153 | $ hg status | |
154 | A f |
|
154 | A f | |
|
155 | ||||
|
156 | $ hg summary | |||
|
157 | parent: 5:a5e1ba2f7afb | |||
|
158 | foobaz | |||
|
159 | branch: default | |||
|
160 | commit: 1 added (new branch head) | |||
|
161 | update: 1 new changesets (update) | |||
|
162 | ||||
155 | $ HGEDITOR='true' hg histedit --continue |
|
163 | $ HGEDITOR='true' hg histedit --continue | |
156 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
164 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
157 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob) |
|
165 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob) |
@@ -419,6 +419,15 b' Test --tool parameter:' | |||||
419 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
419 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
420 | [1] |
|
420 | [1] | |
421 |
|
421 | |||
|
422 | $ hg summary | |||
|
423 | parent: 1:56daeba07f4b | |||
|
424 | c2 | |||
|
425 | parent: 2:e4e3f3546619 tip | |||
|
426 | c2b | |||
|
427 | branch: default | |||
|
428 | commit: 1 modified, 1 unresolved (merge) | |||
|
429 | update: (current) | |||
|
430 | ||||
422 | $ hg resolve -l |
|
431 | $ hg resolve -l | |
423 | U c2 |
|
432 | U c2 | |
424 |
|
433 |
General Comments 0
You need to be logged in to leave comments.
Login now