annotate tests/test-rebase-named-branches.t @ 25881:9de443515f1d stable

help: scripting help topic There are a lot of non-human consumers of Mercurial. And the challenges and considerations for machines consuming Mercurial is significantly different from what humans face. I think there are enough special considerations around how machines consume Mercurial that a dedicated help topic is warranted. I concede the audience for this topic is probably small compared to the general audience. However, lots of normal Mercurial users do things like create one-off shell scripts for common workflows that I think this is useful enough to be in the install (as opposed to, say, a wiki page - which most users will likely never find). This text is by no means perfect. But you have to start somewhere. I think I did cover the important parts, though.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 18 Jul 2015 17:10:28 -0700
parents 701df761aa94
children b2415e94b2f5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
13733
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
39
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
40 $ echo x > x
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
41
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
42 $ hg add x
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
43
15800
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
44 $ 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
45
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
46 $ 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
47 @ 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
48 |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
49 | 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
50 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
51 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
52 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
53 +---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
54 | | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
55 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
56 | | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
57 +---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
58 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
59 | 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
60 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
61 | 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
62 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
63 | 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
64 |/
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
65 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
66
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 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
69
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
70 $ hg rebase -b dev-two -d dev-one --keepbranches
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
71 rebasing 5:24b6387c8c8c "F"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
72 rebasing 6:eea13746799a "G"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
73 rebasing 7:02de42196ebe "H"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
74 rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
75 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-backup.hg (glob)
15800
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 $ 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
78 @ 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
79 |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
80 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
81 |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
82 | 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
83 |/|
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
84 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
85 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
86 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
87 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
88 | 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
89 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
90 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
91 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
92 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
93 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
94 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
95 |/
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
96 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
97
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
98 $ hg rebase -s dev-one -d 0 --keepbranches
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
99 rebasing 5:643fc9128048 "dev-one named branch"
23518
2fb0504b8175 rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents: 23517
diff changeset
100 note: rebase of 5:643fc9128048 created no changes to commit
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
101 rebasing 6:24de4aff8e28 "F"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
102 rebasing 7:4b988a958030 "G"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
103 rebasing 8:31d0e4ba75e6 "H"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
104 rebasing 9:9e70cd31750f "dev-two named branch" (tip)
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
105 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-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
106
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
107 $ 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
108 @ 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
109 |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
110 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
111 |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
112 | 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
113 |/|
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
114 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
115 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
116 | 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
117 |/
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
118 | 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
119 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
120 | 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
121 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
122 | 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
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 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
125
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
126 $ 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
127 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
128 $ 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
129 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
130 $ 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
131
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
132 $ 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
133 @ 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
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 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
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 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
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 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
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 | 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
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 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
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 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
146 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
147 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
148 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
149 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
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 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
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 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
154 rebasing 5:77854864208c "F"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
155 rebasing 6:63b4f9c788a1 "G"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
156 rebasing 7:87861e68abd3 "H"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
157 rebasing 8:ec00d4e0efca "dev-two named branch"
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
158 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-74d59436-backup.hg (glob)
15800
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
159
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
160 $ hg tglog
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
161 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
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 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
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 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
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 | 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
168 | |
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
169 @ | 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
170 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
171 | 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
172 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
173 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
174 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
175 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
176 | |
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
177 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
178 |/
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
179 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
180
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
181 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
182 rebasing 5:643fc9128048 "dev-one named branch"
23518
2fb0504b8175 rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents: 23517
diff changeset
183 note: rebase of 5:643fc9128048 created no changes to commit
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
184 rebasing 6:05584c618d45 "F"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
185 rebasing 7:471695f5257d "G"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
186 rebasing 8:8382a539a2df "H"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
187 rebasing 9:11f718458b32 "dev-two named branch" (tip)
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
188 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-177f3c5c-backup.hg (glob)
15800
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
189
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
190 $ hg tglog
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
191 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
192 |
14119
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
193 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
194 |
14119
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
195 | 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
196 |/|
14119
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
197 o | 5: 'F'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
198 | |
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
199 | o 4: 'E'
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
200 |/
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
201 | 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
202 | |
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
203 | 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
204 | |
13733
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
205 | o 1: 'B'
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
206 |/
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
207 @ 0: 'A'
13733
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
208
14120
d7f80dbbaf49 tests: simplify test-rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14119
diff changeset
209
15800
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
210 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
211
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
212 $ hg rebase -s 1 -d 8 --keepbranches
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
213 rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
214 rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
215 rebasing 3:32af7686d403 "D"
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
216 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-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
217
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
218 $ hg tglog
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
219 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
220 |
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
221 o 7: 'C'
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 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
224 |
15800
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
225 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
226 |
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
227 o 4: 'H'
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
228 |
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
229 | 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
230 |/|
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
231 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
232 | |
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
233 | 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
234 |/
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
235 @ 0: 'A'
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
236
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
237 $ 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
238 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
239 [255]
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
240
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
241 $ hg rebase -s 5 -d 4
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
242 rebasing 5:32d3b0de7f37 "dev-two named branch"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
243 rebasing 6:580fcd9fd48f "B"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
244 rebasing 7:32aba0402ed2 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
245 rebasing 8:e4787b575338 "D" (tip)
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
246 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-c37815ca-backup.hg (glob)
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
247
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
248 $ hg tglog
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
249 o 8: 'D'
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
250 |
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
251 o 7: 'C'
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
252 |
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
253 o 6: 'B'
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
254 |
15800
e4fc0f0b4f7e rebase: reinstate old-style rev spec support for the source and base (issue3181)
Steven Brown <StevenGBrown@gmail.com>
parents: 15615
diff changeset
255 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
256 |
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
257 o 4: 'H'
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
258 |
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
259 | o 3: 'G'
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
260 |/|
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
261 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
262 | |
14124
81ecc951f57b tests: move rebase-keep-branch into rebase-named-branches
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14123
diff changeset
263 | 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
264 |/
19925
9c78ed396075 rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16350
diff changeset
265 @ 0: 'A'
13733
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
266
21027
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
267
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
268 Reopen branch by rebase
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
269
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
270 $ hg up -qr3
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
271 $ hg branch -q b
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
272 $ hg ci -m 'create b'
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
273 $ hg ci -m 'close b' --close
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
274 $ hg rebase -b 8 -d b
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
275 reopening closed branch head ea9de14a36c6
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
276 rebasing 4:86693275b2ef "H"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
277 rebasing 5:2149726d0970 "dev-two named branch"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
278 rebasing 6:81e55225e95d "B"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
279 rebasing 7:09eda3dc3195 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
280 rebasing 8:31298fc9d159 "D"
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
281 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-f9fcf4e2-backup.hg (glob)
21027
25ee5dbebc6b rebase: tell when reopening a closed branch head
Mads Kiilerich <madski@unity3d.com>
parents: 20251
diff changeset
282
13733
4e2690a764c1 rebase: allow for rebasing descendants onto ancestors on different named branches
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
283 $ cd ..
20251
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
284
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
285 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
286
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
287 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
288
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
289 $ hg init case1
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
290 $ cd case1
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
291 $ touch f
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
292 $ hg ci -qAm0
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
293 $ 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
294 $ echo >> f
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
295 $ 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
296 $ 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
297 $ 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
298 $ 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
299 $ 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
300 $ 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
301 $ 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
302
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
303 $ hg tglog
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
304 @ 3: 'c1' c
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
305 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
306 | 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
307 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
308 | 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
309 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
310 o 0: '0'
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
311
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
312 $ 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
313
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
314 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
315
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
316 $ 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
317 $ hg rebase
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
318 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
319 [1]
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
320 $ hg tglog
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
321 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
322 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
323 | @ 2: 'b2' b
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
324 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
325 | 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
326 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
327 o 0: '0'
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
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
330 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
331
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
332 $ cd ../case2
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
333 $ 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
334 $ hg rebase
23517
4f18e80d9c30 rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents: 23516
diff changeset
335 rebasing 1:40039acb7ca5 "b1"
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23518
diff changeset
336 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-backup.hg (glob)
20251
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
337 $ hg tglog
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
338 @ 3: 'b1' b
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
339 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
340 | 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
341 | |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
342 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
343 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
344 o 0: '0'
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
345
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
346
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
347 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
348
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
349 $ 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
350 $ 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
351 $ 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
352 $ hg tglog
24216
4bb348ae43cb log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 23835
diff changeset
353 _ 4: 'c2 closed' c
20251
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
354 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
355 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
356 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
357 | @ 2: 'c1' c
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
358 | |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
359 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
360 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
361 o 0: '0'
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
362
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
363 $ hg rebase
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
364 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
365 [1]
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
366 $ hg tglog
24216
4bb348ae43cb log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 23835
diff changeset
367 _ 4: 'c2 closed' c
20251
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
368 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
369 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
370 |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
371 | @ 2: 'c1' c
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
372 | |
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
373 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
374 |/
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
375 o 0: '0'
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
376
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
377
7876013de139 tests: introduce test for rebasing on named branches with closed heads
Mads Kiilerich <madski@unity3d.com>
parents: 20117
diff changeset
378 $ cd ..