Mercurial > hg > mercurial-source

comparison tests/test-histedit-fold.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 f209c85183a7
children e7ff83b2bcfe
comparison
equal deleted inserted replaced
28281:157675d0f600 28282:dcbba68e076f
303 $ hg resolve -l 303 $ hg resolve -l
304 U file 304 U file
305 $ hg revert -r 'p1()' file 305 $ hg revert -r 'p1()' file
306 $ hg resolve --mark file 306 $ hg resolve --mark file
307 (no more unresolved files) 307 (no more unresolved files)
308 continue: hg histedit --continue
308 $ hg histedit --continue 309 $ hg histedit --continue
309 251d831eeec5: empty changeset 310 251d831eeec5: empty changeset
310 saved backup bundle to $TESTTMP/*-backup.hg (glob) 311 saved backup bundle to $TESTTMP/*-backup.hg (glob)
311 $ hg logt --graph 312 $ hg logt --graph
312 @ 1:617f94f13c0f +4 313 @ 1:617f94f13c0f +4
362 > 4 363 > 4
363 > 5 364 > 5
364 > EOF 365 > EOF
365 $ hg resolve --mark file 366 $ hg resolve --mark file
366 (no more unresolved files) 367 (no more unresolved files)
368 continue: hg histedit --continue
367 $ hg commit -m '+5.2' 369 $ hg commit -m '+5.2'
368 created new head 370 created new head
369 $ echo 6 >> file 371 $ echo 6 >> file
370 $ HGEDITOR=cat hg histedit --continue 372 $ HGEDITOR=cat hg histedit --continue
371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved