Mercurial > hg

comparison tests/test-rebase-abort.t @ 28003:a1d4ca0c8483

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix rebase-abort directory nesting Without this change, some test repositories were nesting needlessly
author timeless <timeless@mozdev.org>
date Thu, 04 Feb 2016 23:30:49 +0000
parents a01ecbcfaf84
children 8abd9f785030
comparison
equal deleted inserted replaced
28002:e862b1fd33a8 28003:a1d4ca0c8483
354 conflicting 2 354 conflicting 2
355 branch: default 355 branch: default
356 commit: (clean) 356 commit: (clean)
357 update: 1 new changesets, 2 branch heads (merge) 357 update: 1 new changesets, 2 branch heads (merge)
358 phases: 4 draft 358 phases: 4 draft
359 $ cd ..
359 360
360 test aborting a rebase succeeds after rebasing with skipped commits onto a 361 test aborting a rebase succeeds after rebasing with skipped commits onto a
361 public changeset (issue4896) 362 public changeset (issue4896)
362 363
363 $ hg init succeedonpublic 364 $ hg init succeedonpublic
387 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') 388 warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
388 unresolved conflicts (see hg resolve, then hg rebase --continue) 389 unresolved conflicts (see hg resolve, then hg rebase --continue)
389 [1] 390 [1]
390 $ hg rebase --abort 391 $ hg rebase --abort
391 rebase aborted 392 rebase aborted
392 393 $ cd ..
394