Mercurial > hg
annotate tests/test-rebase-named-branches.t @ 20647:70d02abff434
histedit: clean up lock imports
We are alread importing the release function from lock, no need
to actually import the module too.
author | Olle Lundberg <geek@nerd.sh> |
---|---|
date | Wed, 05 Mar 2014 22:02:45 +0100 |
parents | 7876013de139 |
children | 25ee5dbebc6b |
rev | line source |
---|---|
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
2 > [extensions] |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
3 > rebase= |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
4 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15615
diff
changeset
|
5 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15615
diff
changeset
|
6 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15615
diff
changeset
|
7 > |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
8 > [alias] |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
9 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
10 > EOF |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
11 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
12 $ hg init a |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
13 $ cd a |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15801
diff
changeset
|
14 $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
14118
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13733
diff
changeset
|
15 adding changesets |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13733
diff
changeset
|
16 adding manifests |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13733
diff
changeset
|
17 adding file changes |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
18 added 8 changesets with 7 changes to 7 files (+2 heads) |
14118
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13733
diff
changeset
|
19 (run 'hg heads' to see heads, 'hg merge' to merge) |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13733
diff
changeset
|
20 $ hg up tip |
7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13733
diff
changeset
|
21 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
22 $ cd .. |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
23 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
24 $ hg clone -q -u . a a1 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
25 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
26 $ cd a1 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
27 |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
28 $ hg update 3 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
29 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
30 $ hg branch dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
31 marked working directory as branch dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
32 (branches are permanent and global, did you want a bookmark?) |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
33 $ hg ci -m 'dev-one named branch' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
34 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
35 $ hg update 7 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
36 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
37 $ hg branch dev-two |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
38 marked working directory as branch dev-two |
15615 | 39 (branches are permanent and global, did you want a bookmark?) |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
40 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
41 $ echo x > x |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
42 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
43 $ hg add x |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
44 |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
45 $ hg ci -m 'dev-two named branch' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
46 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
47 $ hg tglog |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
48 @ 9: 'dev-two named branch' dev-two |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
49 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
50 | o 8: 'dev-one named branch' dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
51 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
52 o | 7: 'H' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
53 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
54 +---o 6: 'G' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
55 | | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
56 o | | 5: 'F' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
57 | | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
58 +---o 4: 'E' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
59 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
60 | o 3: 'D' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
61 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
62 | o 2: 'C' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
63 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
64 | o 1: 'B' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
65 |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
66 o 0: 'A' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
67 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
68 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
69 Branch name containing a dash (issue3181) |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
70 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
71 $ hg rebase -b dev-two -d dev-one --keepbranches |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
72 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
73 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
74 $ hg tglog |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
75 @ 9: 'dev-two named branch' dev-two |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
76 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
77 o 8: 'H' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
78 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
79 | o 7: 'G' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
80 |/| |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
81 o | 6: 'F' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
82 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
83 o | 5: 'dev-one named branch' dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
84 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
85 | o 4: 'E' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
86 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
87 o | 3: 'D' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
88 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
89 o | 2: 'C' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
90 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
91 o | 1: 'B' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
92 |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
93 o 0: 'A' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
94 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
95 $ hg rebase -s dev-one -d 0 --keepbranches |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
96 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
97 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
98 $ hg tglog |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
99 @ 8: 'dev-two named branch' dev-two |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
100 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
101 o 7: 'H' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
102 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
103 | o 6: 'G' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
104 |/| |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
105 o | 5: 'F' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
106 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
107 | o 4: 'E' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
108 |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
109 | o 3: 'D' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
110 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
111 | o 2: 'C' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
112 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
113 | o 1: 'B' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
114 |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
115 o 0: 'A' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
116 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
117 $ hg update 3 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
118 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
119 $ hg branch dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
120 marked working directory as branch dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
121 (branches are permanent and global, did you want a bookmark?) |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
122 $ hg ci -m 'dev-one named branch' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
123 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
124 $ hg tglog |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
125 @ 9: 'dev-one named branch' dev-one |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
126 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
127 | o 8: 'dev-two named branch' dev-two |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
128 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
129 | o 7: 'H' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
130 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
131 | | o 6: 'G' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
132 | |/| |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
133 | o | 5: 'F' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
134 | | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
135 | | o 4: 'E' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
136 | |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
137 o | 3: 'D' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
138 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
139 o | 2: 'C' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
140 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
141 o | 1: 'B' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
142 |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
143 o 0: 'A' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
144 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
145 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
146 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
147 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
148 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
149 o 9: 'dev-two named branch' dev-two |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
150 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
151 o 8: 'H' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
152 | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
153 | o 7: 'G' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
154 |/| |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
155 o | 6: 'F' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
156 | | |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
157 @ | 5: 'dev-one named branch' dev-one |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
158 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
159 | o 4: 'E' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
160 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
161 o | 3: 'D' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
162 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
163 o | 2: 'C' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
164 | | |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
165 o | 1: 'B' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
166 |/ |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
167 o 0: 'A' |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
168 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
169 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
170 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
171 |
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
172 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
173 o 8: 'dev-two named branch' dev-two |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
174 | |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
175 o 7: 'H' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
176 | |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
177 | o 6: 'G' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
178 |/| |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
179 o | 5: 'F' |
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
180 | | |
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
181 | o 4: 'E' |
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
182 |/ |
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
183 | o 3: 'D' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
184 | | |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
185 | o 2: 'C' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
186 | | |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
187 | o 1: 'B' |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
188 |/ |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
189 @ 0: 'A' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
190 |
14120
d7f80dbbaf49
tests: simplify test-rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14119
diff
changeset
|
191 |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
192 Rebasing descendant onto ancestor across different named branches |
14120
d7f80dbbaf49
tests: simplify test-rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14119
diff
changeset
|
193 |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
194 $ hg rebase -s 1 -d 8 --keepbranches |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
195 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
196 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
197 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
198 o 8: 'D' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
199 | |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
200 o 7: 'C' |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
201 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
202 o 6: 'B' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
203 | |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
204 o 5: 'dev-two named branch' dev-two |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
205 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
206 o 4: 'H' |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
207 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
208 | o 3: 'G' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
209 |/| |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
210 o | 2: 'F' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
211 | | |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
212 | o 1: 'E' |
14119
624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14118
diff
changeset
|
213 |/ |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
214 @ 0: 'A' |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
215 |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
216 $ hg rebase -s 4 -d 5 |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
217 abort: source is ancestor of destination |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
218 [255] |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
219 |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
220 $ hg rebase -s 5 -d 4 |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
221 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
222 |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
223 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
224 o 8: 'D' |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
225 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
226 o 7: 'C' |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
227 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
228 o 6: 'B' |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
229 | |
15800
e4fc0f0b4f7e
rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents:
15615
diff
changeset
|
230 o 5: 'dev-two named branch' |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
231 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
232 o 4: 'H' |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
233 | |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
234 | o 3: 'G' |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
235 |/| |
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
236 o | 2: 'F' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
237 | | |
14124
81ecc951f57b
tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
14123
diff
changeset
|
238 | o 1: 'E' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
239 |/ |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16350
diff
changeset
|
240 @ 0: 'A' |
13733
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
241 |
4e2690a764c1
rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
242 $ cd .. |
20251
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
243 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
244 Rebase to other head on branch |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
245 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
246 Set up a case: |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
247 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
248 $ hg init case1 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
249 $ cd case1 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
250 $ touch f |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
251 $ hg ci -qAm0 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
252 $ hg branch -q b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
253 $ echo >> f |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
254 $ hg ci -qAm 'b1' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
255 $ hg up -qr -2 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
256 $ hg branch -qf b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
257 $ hg ci -qm 'b2' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
258 $ hg up -qr -3 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
259 $ hg branch -q c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
260 $ hg ci -m 'c1' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
261 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
262 $ hg tglog |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
263 @ 3: 'c1' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
264 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
265 | o 2: 'b2' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
266 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
267 | o 1: 'b1' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
268 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
269 o 0: '0' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
270 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
271 $ hg clone -q . ../case2 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
272 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
273 rebase 'b2' to another lower branch head |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
274 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
275 $ hg up -qr 2 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
276 $ hg rebase |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
277 nothing to rebase - working directory parent is also destination |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
278 [1] |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
279 $ hg tglog |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
280 o 3: 'c1' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
281 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
282 | @ 2: 'b2' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
283 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
284 | o 1: 'b1' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
285 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
286 o 0: '0' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
287 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
288 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
289 rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1') |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
290 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
291 $ cd ../case2 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
292 $ hg up -qr 1 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
293 $ hg rebase |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
294 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob) |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
295 $ hg tglog |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
296 @ 3: 'b1' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
297 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
298 | o 2: 'c1' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
299 | | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
300 o | 1: 'b2' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
301 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
302 o 0: '0' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
303 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
304 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
305 rebase 'c1' to the branch head 'c2' that is closed |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
306 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
307 $ hg branch -qf c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
308 $ hg ci -qm 'c2 closed' --close |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
309 $ hg up -qr 2 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
310 $ hg tglog |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
311 o 4: 'c2 closed' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
312 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
313 o 3: 'b1' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
314 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
315 | @ 2: 'c1' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
316 | | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
317 o | 1: 'b2' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
318 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
319 o 0: '0' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
320 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
321 $ hg rebase |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
322 nothing to rebase - working directory parent is also destination |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
323 [1] |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
324 $ hg tglog |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
325 o 4: 'c2 closed' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
326 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
327 o 3: 'b1' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
328 | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
329 | @ 2: 'c1' c |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
330 | | |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
331 o | 1: 'b2' b |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
332 |/ |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
333 o 0: '0' |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
334 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
335 |
7876013de139
tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
336 $ cd .. |