Changeset View
Changeset View
Standalone View
Standalone View
tests/test-branch-change.t
| Show All 28 Lines | Setup | ||||
| $ hg branches | $ hg branches | ||||
| default 4:aa98ab95a928 | default 4:aa98ab95a928 | ||||
| Try without passing a new branch name | Try without passing a new branch name | ||||
| $ hg branch -r . | $ hg branch -r . | ||||
| abort: no branch name specified for the revisions | abort: no branch name specified for the revisions | ||||
| [255] | [10] | ||||
| Setting an invalid branch name | Setting an invalid branch name | ||||
| $ hg branch -r . a:b | $ hg branch -r . a:b | ||||
| abort: ':' cannot be used in a name | abort: ':' cannot be used in a name | ||||
| [255] | [255] | ||||
| $ hg branch -r . tip | $ hg branch -r . tip | ||||
| abort: the name 'tip' is reserved | abort: the name 'tip' is reserved | ||||
| [255] | [255] | ||||
| $ hg branch -r . 1234 | $ hg branch -r . 1234 | ||||
| abort: cannot use an integer as a name | abort: cannot use an integer as a name | ||||
| [255] | [255] | ||||
| Change on non-linear set of commits | Change on non-linear set of commits | ||||
| $ 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 | ||||
| [255] | [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] | [255] | ||||
| 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 | ||||
| [255] | [255] | ||||
| $ hg revert --all | $ hg revert --all | ||||
| reverting a | reverting a | ||||
| Change on empty revision set | Change on empty revision set | ||||
| $ hg branch -r 'draft() - all()' foo | $ hg branch -r 'draft() - all()' foo | ||||
| abort: empty revision set | abort: empty revision set | ||||
| [255] | [10] | ||||
| Changing branch on linear set of commits from head | Changing branch on linear set of commits from head | ||||
| Without obsmarkers | Without obsmarkers | ||||
| $ hg branch -r 3:4 foo --config experimental.evolution=! | $ hg branch -r 3:4 foo --config experimental.evolution=! | ||||
| changed branch on 2 changesets | changed branch on 2 changesets | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/62615734edd5-e86bd13a-branch-change.hg | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/62615734edd5-e86bd13a-branch-change.hg | ||||
| Show All 32 Lines | With obsmarkers | ||||
| $ hg branches | $ hg branches | ||||
| bar 6:7c1991464886 | bar 6:7c1991464886 | ||||
| default 2:28ad74487de9 (inactive) | default 2:28ad74487de9 (inactive) | ||||
| Change branch name to an existing branch | Change branch name to an existing branch | ||||
| $ 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 | ||||
| [255] | [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] | [255] | ||||
| 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 | ||||
| Show All 9 Lines | Changing branch of an obsoleted changeset | ||||
| $ hg branch -r 4 foobar | $ hg branch -r 4 foobar | ||||
| abort: hidden revision '4' was rewritten as: 7c1991464886! | abort: hidden revision '4' was rewritten as: 7c1991464886! | ||||
| (use --hidden to access hidden revisions) | (use --hidden to access hidden revisions) | ||||
| [255] | [255] | ||||
| $ hg branch -r 4 --hidden foobar | $ hg branch -r 4 --hidden foobar | ||||
| abort: cannot change branch of a obsolete changeset | abort: cannot change branch of a obsolete changeset | ||||
| [255] | [10] | ||||
| Make sure bookmark movement is correct | Make sure bookmark movement is correct | ||||
| $ hg bookmark b1 | $ hg bookmark b1 | ||||
| $ hg glog -r '.^::' | $ hg glog -r '.^::' | ||||
| @ 6:7c1991464886 Added e | @ 6:7c1991464886 Added e | ||||
| | bar (b1) | | bar (b1) | ||||
| * 5:1ea05e93925f Added d | * 5:1ea05e93925f Added d | ||||
| ▲ Show 20 Lines • Show All 187 Lines • ▼ Show 20 Line(s) | Changing branch of a merge commit | ||||
| 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | ||||
| changed branch on 1 changesets | changed branch on 1 changesets | ||||
| $ hg branch -r . jkl | $ hg branch -r . jkl | ||||
| changed branch on 1 changesets | changed branch on 1 changesets | ||||
| $ hg branch -r . default | $ hg branch -r . default | ||||
| changed branch on 1 changesets | changed branch on 1 changesets | ||||
| $ hg branch -r . stable | $ hg branch -r . stable | ||||
| abort: a branch of the same name already exists | abort: a branch of the same name already exists | ||||
| [255] | [10] | ||||
| $ hg branch -r . stable --force | $ hg branch -r . stable --force | ||||
| changed branch on 1 changesets | changed branch on 1 changesets | ||||
| $ hg branches | $ hg branches | ||||
| stable 34:d1c2addda4a2 | stable 34:d1c2addda4a2 | ||||
| jkl 29:6bc1c6c2c9da (inactive) | jkl 29:6bc1c6c2c9da (inactive) | ||||
| ghi 28:2f1019bd29d2 (inactive) | ghi 28:2f1019bd29d2 (inactive) | ||||
| ▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines | |||||