Mercurial > hg
comparison tests/test-rebase-detach.t @ 27626:157675d0f600
rebase: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:41:40 +0000 |
| parents | d1561a422748 |
| children | 3b7cb3d17137 |
comparison
equal
deleted
inserted
replaced
| 27625:cdb9493a7e2f | 27626:157675d0f600 |
|---|---|
| 389 warning: conflicts while merging H! (edit, then use 'hg resolve --mark') | 389 warning: conflicts while merging H! (edit, then use 'hg resolve --mark') |
| 390 unresolved conflicts (see hg resolve, then hg rebase --continue) | 390 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 391 [1] | 391 [1] |
| 392 $ hg resolve --all -t internal:local | 392 $ hg resolve --all -t internal:local |
| 393 (no more unresolved files) | 393 (no more unresolved files) |
| 394 continue: hg rebase --continue | |
| 394 $ hg rebase -c | 395 $ hg rebase -c |
| 395 rebasing 8:6215fafa5447 "H2" (tip) | 396 rebasing 8:6215fafa5447 "H2" (tip) |
| 396 note: rebase of 8:6215fafa5447 created no changes to commit | 397 note: rebase of 8:6215fafa5447 created no changes to commit |
| 397 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-backup.hg (glob) | 398 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-backup.hg (glob) |
| 398 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 399 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |