Changeset View
Changeset View
Standalone View
Standalone View
tests/test-rebase-obsolete.t
| Show First 20 Lines • Show All 482 Lines • ▼ Show 20 Line(s) | --------------------------------------------------------------------- | ||||
| |/ | |/ | ||||
| o 0:cd010b8cd998 A | o 0:cd010b8cd998 A | ||||
| $ cd .. | $ cd .. | ||||
| $ cp -R hidden stabilize | $ cp -R hidden stabilize | ||||
| $ cd stabilize | $ cd stabilize | ||||
| $ hg rebase --auto-orphans '0::' -d 10 | $ hg rebase --auto-orphans '0::' -d 10 | ||||
| abort: cannot specify both --auto-orphans and --dest | abort: cannot specify both --auto-orphans and --dest | ||||
| [255] | [10] | ||||
| $ hg rebase --auto-orphans '0::' | $ hg rebase --auto-orphans '0::' | ||||
| rebasing 9:cf44d2f5a9f4 "D" | rebasing 9:cf44d2f5a9f4 "D" | ||||
| $ hg log -G | $ hg log -G | ||||
| o 12:7e3935feaa68 D | o 12:7e3935feaa68 D | ||||
| | | | | ||||
| o 11:0d8f238b634c C | o 11:0d8f238b634c C | ||||
| | | | | ||||
| o 10:7c6027df6a99 B | o 10:7c6027df6a99 B | ||||
| ▲ Show 20 Lines • Show All 1548 Lines • ▼ Show 20 Line(s) | ================================================= | ||||
| $ hg rebase -s 3 -d 5 | $ hg rebase -s 3 -d 5 | ||||
| rebasing 3:055a42cdd887 "d" | rebasing 3:055a42cdd887 "d" | ||||
| merging d | merging d | ||||
| warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | ||||
| unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | ||||
| [240] | [240] | ||||
| $ hg rebase --stop --dry-run | $ hg rebase --stop --dry-run | ||||
| abort: cannot specify both --stop and --dry-run | abort: cannot specify both --stop and --dry-run | ||||
| [255] | [10] | ||||
| $ hg rebase -s 3 -d 5 | $ hg rebase -s 3 -d 5 | ||||
| abort: rebase in progress | abort: rebase in progress | ||||
| (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') | (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') | ||||
| [255] | [255] | ||||
| $ hg rebase --stop --continue | $ hg rebase --stop --continue | ||||
| abort: cannot specify both --stop and --continue | abort: cannot specify both --stop and --continue | ||||
| [255] | [10] | ||||
| Test --stop moves bookmarks of original revisions to new rebased nodes: | Test --stop moves bookmarks of original revisions to new rebased nodes: | ||||
| ====================================================================== | ====================================================================== | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init repo | $ hg init repo | ||||
| $ cd repo | $ cd repo | ||||
| $ echo a > a | $ echo a > a | ||||
| ▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines | |||||