Mercurial > hg > mercurial-source

comparison tests/test-histedit-base.t @ 28282:dcbba68e076f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: hook afterresolvedstates
author timeless <timeless@mozdev.org>
date Thu, 24 Dec 2015 20:41:17 +0000
parents a67d2e059a51
children e7ff83b2bcfe
comparison
equal deleted inserted replaced
28281:157675d0f600 28282:dcbba68e076f
176 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') 176 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
177 Fix up the change and run hg histedit --continue 177 Fix up the change and run hg histedit --continue
178 $ echo b2 > B 178 $ echo b2 > B
179 $ hg resolve --mark B 179 $ hg resolve --mark B
180 (no more unresolved files) 180 (no more unresolved files)
181 continue: hg histedit --continue
181 $ hg histedit --continue | fixbundle 182 $ hg histedit --continue | fixbundle
182 $ hg tglog 183 $ hg tglog
183 @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' 184 @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
184 | 185 |
185 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' 186 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B'