| durin42 | |
| mharbison72 |
| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/rewriteutil.py (8 lines) | |||
| M | tests/test-amend.t (4 lines) | |||
| M | tests/test-branch-change.t (6 lines) | |||
| M | tests/test-commit-amend.t (4 lines) | |||
| M | tests/test-fix.t (6 lines) | |||
| M | tests/test-histedit-obsolete.t (2 lines) | |||
| M | tests/test-rebase-collapse.t (2 lines) | |||
| M | tests/test-rebase-scenario-global.t (14 lines) | |||
| M | tests/test-split.t (6 lines) | |||
| M | tests/test-unamend.t (4 lines) | |||
| M | tests/test-uncommit.t (4 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| eb42332da4b1 | d68618954ade | Martin von Zweigbergk | Nov 16 2020, 6:11 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| """check if revs can be rewritten | """check if revs can be rewritten | ||||
| action is used to control the error message. | action is used to control the error message. | ||||
| Make sure this function is called after taking the lock. | Make sure this function is called after taking the lock. | ||||
| """ | """ | ||||
| if node.nullrev in revs: | if node.nullrev in revs: | ||||
| msg = _(b"cannot %s null changeset") % action | msg = _(b"cannot %s null changeset") % action | ||||
| hint = _(b"no changeset checked out") | hint = _(b"no changeset checked out") | ||||
| raise error.Abort(msg, hint=hint) | raise error.InputError(msg, hint=hint) | ||||
| if len(repo[None].parents()) > 1: | if len(repo[None].parents()) > 1: | ||||
| raise error.Abort(_(b"cannot %s while merging") % action) | raise error.StateError(_(b"cannot %s while merging") % action) | ||||
| publicrevs = repo.revs(b'%ld and public()', revs) | publicrevs = repo.revs(b'%ld and public()', revs) | ||||
| if publicrevs: | if publicrevs: | ||||
| msg = _(b"cannot %s public changesets") % action | msg = _(b"cannot %s public changesets") % action | ||||
| hint = _(b"see 'hg help phases' for details") | hint = _(b"see 'hg help phases' for details") | ||||
| raise error.Abort(msg, hint=hint) | raise error.InputError(msg, hint=hint) | ||||
| newunstable = disallowednewunstable(repo, revs) | newunstable = disallowednewunstable(repo, revs) | ||||
| if newunstable: | if newunstable: | ||||
| raise error.Abort(_(b"cannot %s changeset with children") % action) | raise error.InputError(_(b"cannot %s changeset with children") % action) | ||||
| def disallowednewunstable(repo, revs): | def disallowednewunstable(repo, revs): | ||||
| """Checks whether editing the revs will create new unstable changesets and | """Checks whether editing the revs will create new unstable changesets and | ||||
| are we allowed to create them. | are we allowed to create them. | ||||
| To allow new unstable changesets, set the config: | To allow new unstable changesets, set the config: | ||||
| `experimental.evolution.allowunstable=True` | `experimental.evolution.allowunstable=True` | ||||
| > | | > | | ||||
| > A | > A | ||||
| > EOS | > EOS | ||||
| $ hg update -q B | $ hg update -q B | ||||
| $ echo 2 >> B | $ echo 2 >> B | ||||
| $ hg amend | $ hg amend | ||||
| abort: cannot amend changeset with children | abort: cannot amend changeset with children | ||||
| [255] | [10] | ||||
| #if obsstore-on | #if obsstore-on | ||||
| With allowunstable, amend could work in the middle of a stack | With allowunstable, amend could work in the middle of a stack | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [experimental] | > [experimental] | ||||
| > evolution.createmarkers=True | > evolution.createmarkers=True | ||||
| Cannot amend public changeset | Cannot amend public changeset | ||||
| $ hg phase -r A --public | $ hg phase -r A --public | ||||
| $ hg update -C -q A | $ hg update -C -q A | ||||
| $ hg amend -m AMEND | $ hg amend -m AMEND | ||||
| abort: cannot amend public changesets | abort: cannot amend public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| Amend a merge changeset | Amend a merge changeset | ||||
| $ hg init $TESTTMP/repo3 | $ hg init $TESTTMP/repo3 | ||||
| $ cd $TESTTMP/repo3 | $ cd $TESTTMP/repo3 | ||||
| $ hg debugdrawdag <<'EOS' | $ hg debugdrawdag <<'EOS' | ||||
| > C | > C | ||||
| > /| | > /| | ||||
| $ hg branch -r 2 -r 4 foo | $ hg branch -r 2 -r 4 foo | ||||
| abort: cannot change branch of non-linear revisions | abort: cannot change branch of non-linear revisions | ||||
| [10] | [10] | ||||
| Change in middle of the stack (linear commits) | Change in middle of the stack (linear commits) | ||||
| $ hg branch -r 1::3 foo | $ hg branch -r 1::3 foo | ||||
| abort: cannot change branch of changeset with children | abort: cannot change branch of changeset with children | ||||
| [255] | [10] | ||||
| Change with dirty working directory | Change with dirty working directory | ||||
| $ echo bar > a | $ echo bar > a | ||||
| $ hg branch -r . foo | $ hg branch -r . foo | ||||
| abort: uncommitted changes | abort: uncommitted changes | ||||
| [20] | [20] | ||||
| $ hg branch -r . default | $ hg branch -r . default | ||||
| abort: a branch of the same name already exists | abort: a branch of the same name already exists | ||||
| [10] | [10] | ||||
| Changing on a branch head which is not topological head | Changing on a branch head which is not topological head | ||||
| $ hg branch -r 2 stable | $ hg branch -r 2 stable | ||||
| abort: cannot change branch of changeset with children | abort: cannot change branch of changeset with children | ||||
| [255] | [10] | ||||
| Enabling the allowunstable config and trying to change branch on a branch head | Enabling the allowunstable config and trying to change branch on a branch head | ||||
| which is not a topological head | which is not a topological head | ||||
| $ echo "[experimental]" >> .hg/hgrc | $ echo "[experimental]" >> .hg/hgrc | ||||
| $ echo "evolution.allowunstable=yes" >> .hg/hgrc | $ echo "evolution.allowunstable=yes" >> .hg/hgrc | ||||
| $ hg branch -r 2 foo | $ hg branch -r 2 foo | ||||
| changed branch on 1 changesets | changed branch on 1 changesets | ||||
| ghi 28:2f1019bd29d2 (inactive) | ghi 28:2f1019bd29d2 (inactive) | ||||
| Changing branch on public changeset | Changing branch on public changeset | ||||
| $ hg phase -r . -p | $ hg phase -r . -p | ||||
| $ hg branch -r . def | $ hg branch -r . def | ||||
| abort: cannot change branch of public changesets | abort: cannot change branch of public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| Merge commit with conflicts, with evolution and without | Merge commit with conflicts, with evolution and without | ||||
| $ mklozenge() { | $ mklozenge() { | ||||
| > echo foo > a | > echo foo > a | ||||
| > hg ci -qAm foo | > hg ci -qAm foo | ||||
| > echo bar > a | > echo bar > a | ||||
| > hg ci -qm bar | > hg ci -qm bar | ||||
| $ hg init | $ hg init | ||||
| Setup: | Setup: | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg ci -Am 'base' | $ hg ci -Am 'base' | ||||
| adding a | adding a | ||||
| Refuse to amend public csets: | Refuse to amend public csets: | ||||
| $ hg phase -r . -p | $ hg phase -r . -p | ||||
| $ hg ci --amend | $ hg ci --amend | ||||
| abort: cannot amend public changesets | abort: cannot amend public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg phase -r . -f -d | $ hg phase -r . -f -d | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg ci -Am 'base1' | $ hg ci -Am 'base1' | ||||
| Nothing to amend: | Nothing to amend: | ||||
| $ hg ci --amend -m 'base1' | $ hg ci --amend -m 'base1' | ||||
| Refuse to amend during a merge: | Refuse to amend during a merge: | ||||
| $ hg up -q default | $ hg up -q default | ||||
| $ hg merge foo | $ hg merge foo | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg ci --amend | $ hg ci --amend | ||||
| abort: cannot amend while merging | abort: cannot amend while merging | ||||
| [255] | [20] | ||||
| $ hg ci -m 'merge' | $ hg ci -m 'merge' | ||||
| Refuse to amend if there is a merge conflict (issue5805): | Refuse to amend if there is a merge conflict (issue5805): | ||||
| $ hg up -q foo | $ hg up -q foo | ||||
| $ echo c > a | $ echo c > a | ||||
| $ hg up default -t :fail | $ hg up default -t :fail | ||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
| nothing happens, even to the working directory. | nothing happens, even to the working directory. | ||||
| $ printf "hello\n" > hello.whole | $ printf "hello\n" > hello.whole | ||||
| $ hg commit -Aqm "hello" | $ hg commit -Aqm "hello" | ||||
| $ hg phase -r 0 --public | $ hg phase -r 0 --public | ||||
| $ hg fix -r 0 | $ hg fix -r 0 | ||||
| abort: cannot fix public changesets | abort: cannot fix public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg fix -r 0 --working-dir | $ hg fix -r 0 --working-dir | ||||
| abort: cannot fix public changesets | abort: cannot fix public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg cat -r tip hello.whole | $ hg cat -r tip hello.whole | ||||
| hello | hello | ||||
| $ cat hello.whole | $ cat hello.whole | ||||
| hello | hello | ||||
| $ cd .. | $ cd .. | ||||
| Fixing a clean working directory should do nothing. Even the --whole flag | Fixing a clean working directory should do nothing. Even the --whole flag | ||||
| $ cd allowunstable | $ cd allowunstable | ||||
| $ printf "one\n" > foo.whole | $ printf "one\n" > foo.whole | ||||
| $ hg commit -Aqm "first" | $ hg commit -Aqm "first" | ||||
| $ printf "two\n" > foo.whole | $ printf "two\n" > foo.whole | ||||
| $ hg commit -m "second" | $ hg commit -m "second" | ||||
| $ hg --config experimental.evolution.allowunstable=False fix -r '.^' | $ hg --config experimental.evolution.allowunstable=False fix -r '.^' | ||||
| abort: cannot fix changeset with children | abort: cannot fix changeset with children | ||||
| [255] | [10] | ||||
| $ hg fix -r '.^' | $ hg fix -r '.^' | ||||
| 1 new orphan changesets | 1 new orphan changesets | ||||
| $ hg cat -r 2 foo.whole | $ hg cat -r 2 foo.whole | ||||
| ONE | ONE | ||||
| $ cd .. | $ cd .. | ||||
| The --base flag affects the set of files being fixed. So while the --whole flag | The --base flag affects the set of files being fixed. So while the --whole flag | ||||
| | | | | ||||
| o 12:40db8afa467b (public) c | o 12:40db8afa467b (public) c | ||||
| | | | | ||||
| o 0:cb9a9f314b8b (public) a | o 0:cb9a9f314b8b (public) a | ||||
| $ hg histedit -r '.~2' | $ hg histedit -r '.~2' | ||||
| abort: cannot edit public changesets | abort: cannot edit public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| Prepare further testing | Prepare further testing | ||||
| ------------------------------------------- | ------------------------------------------- | ||||
| $ for x in g h i j k ; do | $ for x in g h i j k ; do | ||||
| > echo $x > $x | > echo $x > $x | ||||
| > hg add $x | > hg add $x | ||||
| | * move2' | | * move2' | ||||
| o 1: 1352765a01d4 'change' | o 1: 1352765a01d4 'change' | ||||
| | | | | ||||
| o 0: f447d5abf5ea 'add' | o 0: f447d5abf5ea 'add' | ||||
| $ hg rebase --collapse -r 1 -d 0 | $ hg rebase --collapse -r 1 -d 0 | ||||
| abort: cannot rebase changeset with children | abort: cannot rebase changeset with children | ||||
| (use --keep to keep original changesets) | (use --keep to keep original changesets) | ||||
| [255] | [10] | ||||
| Test collapsing in place | Test collapsing in place | ||||
| $ hg rebase --collapse -b . -d 0 | $ hg rebase --collapse -b . -d 0 | ||||
| rebasing 1:1352765a01d4 "change" | rebasing 1:1352765a01d4 "change" | ||||
| rebasing 2:64b456429f67 tip "Collapsed revision" | rebasing 2:64b456429f67 tip "Collapsed revision" | ||||
| saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg | saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg | ||||
| $ hg st --change tip --copies | $ hg st --change tip --copies | ||||
| Check rebasing public changeset | Check rebasing public changeset | ||||
| $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 | $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 | ||||
| $ hg rebase -d 0 -b 6 | $ hg rebase -d 0 -b 6 | ||||
| abort: cannot rebase public changesets | abort: cannot rebase public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg rebase -d 5 -b 6 | $ hg rebase -d 5 -b 6 | ||||
| abort: cannot rebase public changesets | abort: cannot rebase public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg rebase -d 5 -r '1 + (6::)' | $ hg rebase -d 5 -r '1 + (6::)' | ||||
| abort: cannot rebase public changesets | abort: cannot rebase public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg rebase -d 5 -b 6 --keep | $ hg rebase -d 5 -b 6 --keep | ||||
| rebasing 6:e1c4361dd923 "C" | rebasing 6:e1c4361dd923 "C" | ||||
| rebasing 7:c9659aac0000 tip "D" | rebasing 7:c9659aac0000 tip "D" | ||||
| Check rebasing mutable changeset | Check rebasing mutable changeset | ||||
| Source phase greater or equal to destination phase: new changeset get the phase of source: | Source phase greater or equal to destination phase: new changeset get the phase of source: | ||||
| $ hg id -n | $ hg id -n | ||||
| Source on have two descendant heads but ask for one | Source on have two descendant heads but ask for one | ||||
| $ hg clone -q -u . ah ah1 | $ hg clone -q -u . ah ah1 | ||||
| $ cd ah1 | $ cd ah1 | ||||
| $ hg rebase -r '2::8' -d 1 | $ hg rebase -r '2::8' -d 1 | ||||
| abort: cannot rebase changeset with children | abort: cannot rebase changeset with children | ||||
| (use --keep to keep original changesets) | (use --keep to keep original changesets) | ||||
| [255] | [10] | ||||
| $ hg rebase -r '2::8' -d 1 -k | $ hg rebase -r '2::8' -d 1 -k | ||||
| rebasing 2:c9e50f6cdc55 "C" | rebasing 2:c9e50f6cdc55 "C" | ||||
| rebasing 3:ffd453c31098 "D" | rebasing 3:ffd453c31098 "D" | ||||
| rebasing 6:3d8a618087a7 "G" | rebasing 6:3d8a618087a7 "G" | ||||
| rebasing 7:72434a4e60b0 "H" | rebasing 7:72434a4e60b0 "H" | ||||
| rebasing 8:479ddb54a924 tip "I" | rebasing 8:479ddb54a924 tip "I" | ||||
| $ hg tglog | $ hg tglog | ||||
| o 13: 9bf1d9358a90 'I' | o 13: 9bf1d9358a90 'I' | ||||
| Base on have one descendant heads we ask for but common ancestor have two | Base on have one descendant heads we ask for but common ancestor have two | ||||
| $ hg clone -q -u . ah ah2 | $ hg clone -q -u . ah ah2 | ||||
| $ cd ah2 | $ cd ah2 | ||||
| $ hg rebase -r '3::8' -d 1 | $ hg rebase -r '3::8' -d 1 | ||||
| abort: cannot rebase changeset with children | abort: cannot rebase changeset with children | ||||
| (use --keep to keep original changesets) | (use --keep to keep original changesets) | ||||
| [255] | [10] | ||||
| $ hg rebase -r '3::8' -d 1 --keep | $ hg rebase -r '3::8' -d 1 --keep | ||||
| rebasing 3:ffd453c31098 "D" | rebasing 3:ffd453c31098 "D" | ||||
| rebasing 6:3d8a618087a7 "G" | rebasing 6:3d8a618087a7 "G" | ||||
| rebasing 7:72434a4e60b0 "H" | rebasing 7:72434a4e60b0 "H" | ||||
| rebasing 8:479ddb54a924 tip "I" | rebasing 8:479ddb54a924 tip "I" | ||||
| $ hg tglog | $ hg tglog | ||||
| o 12: 9d7da0053b1c 'I' | o 12: 9d7da0053b1c 'I' | ||||
| | | | | ||||
| rebase subset | rebase subset | ||||
| $ hg clone -q -u . ah ah3 | $ hg clone -q -u . ah ah3 | ||||
| $ cd ah3 | $ cd ah3 | ||||
| $ hg rebase -r '3::7' -d 1 | $ hg rebase -r '3::7' -d 1 | ||||
| abort: cannot rebase changeset with children | abort: cannot rebase changeset with children | ||||
| (use --keep to keep original changesets) | (use --keep to keep original changesets) | ||||
| [255] | [10] | ||||
| $ hg rebase -r '3::7' -d 1 --keep | $ hg rebase -r '3::7' -d 1 --keep | ||||
| rebasing 3:ffd453c31098 "D" | rebasing 3:ffd453c31098 "D" | ||||
| rebasing 6:3d8a618087a7 "G" | rebasing 6:3d8a618087a7 "G" | ||||
| rebasing 7:72434a4e60b0 "H" | rebasing 7:72434a4e60b0 "H" | ||||
| $ hg tglog | $ hg tglog | ||||
| o 11: 8fbd00952cbc 'H' | o 11: 8fbd00952cbc 'H' | ||||
| | | | | ||||
| o 10: 51d434a615ee 'G' | o 10: 51d434a615ee 'G' | ||||
| rebase subset with multiple head | rebase subset with multiple head | ||||
| $ hg clone -q -u . ah ah4 | $ hg clone -q -u . ah ah4 | ||||
| $ cd ah4 | $ cd ah4 | ||||
| $ hg rebase -r '3::(7+5)' -d 1 | $ hg rebase -r '3::(7+5)' -d 1 | ||||
| abort: cannot rebase changeset with children | abort: cannot rebase changeset with children | ||||
| (use --keep to keep original changesets) | (use --keep to keep original changesets) | ||||
| [255] | [10] | ||||
| $ hg rebase -r '3::(7+5)' -d 1 --keep | $ hg rebase -r '3::(7+5)' -d 1 --keep | ||||
| rebasing 3:ffd453c31098 "D" | rebasing 3:ffd453c31098 "D" | ||||
| rebasing 4:c01897464e7f "E" | rebasing 4:c01897464e7f "E" | ||||
| rebasing 5:41bfcc75ed73 "F" | rebasing 5:41bfcc75ed73 "F" | ||||
| rebasing 6:3d8a618087a7 "G" | rebasing 6:3d8a618087a7 "G" | ||||
| rebasing 7:72434a4e60b0 "H" | rebasing 7:72434a4e60b0 "H" | ||||
| $ hg tglog | $ hg tglog | ||||
| o 13: 8fbd00952cbc 'H' | o 13: 8fbd00952cbc 'H' | ||||
| $ hg bookmark -i r2 | $ hg bookmark -i r2 | ||||
| Cannot split a public changeset | Cannot split a public changeset | ||||
| $ hg phase --public -r 'all()' | $ hg phase --public -r 'all()' | ||||
| $ hg split . | $ hg split . | ||||
| abort: cannot split public changesets | abort: cannot split public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| $ hg phase --draft -f -r 'all()' | $ hg phase --draft -f -r 'all()' | ||||
| Cannot split while working directory is dirty | Cannot split while working directory is dirty | ||||
| $ touch dirty | $ touch dirty | ||||
| $ hg add dirty | $ hg add dirty | ||||
| $ hg split . | $ hg split . | ||||
| #endif | #endif | ||||
| Split a non-head without rebase | Split a non-head without rebase | ||||
| $ cd $TESTTMP/d | $ cd $TESTTMP/d | ||||
| #if obsstore-off | #if obsstore-off | ||||
| $ runsplit -r 1 --no-rebase | $ runsplit -r 1 --no-rebase | ||||
| abort: cannot split changeset with children | abort: cannot split changeset with children | ||||
| [255] | [10] | ||||
| #else | #else | ||||
| $ runsplit -r 1 --no-rebase >/dev/null | $ runsplit -r 1 --no-rebase >/dev/null | ||||
| 3 new orphan changesets | 3 new orphan changesets | ||||
| $ hg bookmark | $ hg bookmark | ||||
| d1 2:b5c5ea414030 | d1 2:b5c5ea414030 | ||||
| * d2 3:f4a0a8d004cc | * d2 3:f4a0a8d004cc | ||||
| d3 4:777940761eba | d3 4:777940761eba | ||||
| r1 0:a61bcde8c529 | r1 0:a61bcde8c529 | ||||
| > | | > | | ||||
| > A | > A | ||||
| > EOS | > EOS | ||||
| 2 new orphan changesets | 2 new orphan changesets | ||||
| $ eval `hg tags -T '{tag}={node}\n'` | $ eval `hg tags -T '{tag}={node}\n'` | ||||
| $ rm .hg/localtags | $ rm .hg/localtags | ||||
| $ hg split $B --config experimental.evolution=createmarkers | $ hg split $B --config experimental.evolution=createmarkers | ||||
| abort: cannot split changeset with children | abort: cannot split changeset with children | ||||
| [255] | [10] | ||||
| $ cat > $TESTTMP/messages <<EOF | $ cat > $TESTTMP/messages <<EOF | ||||
| > Split B | > Split B | ||||
| > EOF | > EOF | ||||
| $ cat <<EOF | hg split $B | $ cat <<EOF | hg split $B | ||||
| > y | > y | ||||
| > y | > y | ||||
| > EOF | > EOF | ||||
| diff --git a/B b/B | diff --git a/B b/B | ||||
| | | | | ||||
| o 1:29becc82797a Added b | o 1:29becc82797a Added b | ||||
| | | | | ||||
| o 0:18d04c59bb5d Added a | o 0:18d04c59bb5d Added a | ||||
| $ hg --config experimental.evolution=createmarkers unamend | $ hg --config experimental.evolution=createmarkers unamend | ||||
| abort: cannot unamend changeset with children | abort: cannot unamend changeset with children | ||||
| [255] | [10] | ||||
| $ hg unamend | $ hg unamend | ||||
| 3 new orphan changesets | 3 new orphan changesets | ||||
| Trying to unamend a public changeset | Trying to unamend a public changeset | ||||
| $ hg up -C 23 | $ hg up -C 23 | ||||
| 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg phase -r . -p | $ hg phase -r . -p | ||||
| 1 new phase-divergent changesets | 1 new phase-divergent changesets | ||||
| $ hg unamend | $ hg unamend | ||||
| abort: cannot unamend public changesets | abort: cannot unamend public changesets | ||||
| (see 'hg help phases' for details) | (see 'hg help phases' for details) | ||||
| [255] | [10] | ||||
| Testing whether unamend retains copies or not | Testing whether unamend retains copies or not | ||||
| $ hg status | $ hg status | ||||
| $ hg mv a foo | $ hg mv a foo | ||||
| $ hg ci -m "Moved a to foo" | $ hg ci -m "Moved a to foo" | ||||
| (some details hidden, use --verbose to show complete help) | (some details hidden, use --verbose to show complete help) | ||||
| Uncommit with no commits should fail | Uncommit with no commits should fail | ||||
| $ hg uncommit | $ hg uncommit | ||||
| abort: cannot uncommit null changeset | abort: cannot uncommit null changeset | ||||
| (no changeset checked out) | (no changeset checked out) | ||||
| [255] | [10] | ||||
| Create some commits | Create some commits | ||||
| $ touch files | $ touch files | ||||
| $ hg add files | $ hg add files | ||||
| $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done | $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done | ||||
| $ ls -A | $ ls -A | ||||
| .hg | .hg | ||||
| $ hg uncommit | $ hg uncommit | ||||
| abort: outstanding uncommitted merge | abort: outstanding uncommitted merge | ||||
| (requires --allow-dirty-working-copy to uncommit) | (requires --allow-dirty-working-copy to uncommit) | ||||
| [20] | [20] | ||||
| $ hg uncommit --config experimental.uncommitondirtywdir=True | $ hg uncommit --config experimental.uncommitondirtywdir=True | ||||
| abort: cannot uncommit while merging | abort: cannot uncommit while merging | ||||
| [255] | [20] | ||||
| $ hg status | $ hg status | ||||
| M a | M a | ||||
| $ hg commit -m 'merge a and b' | $ hg commit -m 'merge a and b' | ||||
| $ hg uncommit | $ hg uncommit | ||||
| abort: cannot uncommit merge changeset | abort: cannot uncommit merge changeset | ||||
| [255] | [255] | ||||