Mercurial > hg
annotate tests/test-rebase-detach.t @ 15804:a52e42e48e0e
i18-ru: debug commands translated
author | Alexander Sauta <demosito@gmail.com> |
---|---|
date | Fri, 06 Jan 2012 00:16:14 +0400 |
parents | 65df60a3f96b |
children | e66084ef8449 |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
2 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
3 > graphlog= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
4 > rebase= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
5 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15524
diff
changeset
|
6 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15524
diff
changeset
|
7 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15524
diff
changeset
|
8 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
9 > [alias] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
11 > EOF |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
12 |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
10352
diff
changeset
|
13 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
14 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
15 $ cd a |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
16 $ hg unbundle $TESTDIR/bundles/rebase.hg |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
17 adding changesets |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
18 adding manifests |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
19 adding file changes |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
20 added 8 changesets with 7 changes to 7 files (+2 heads) |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
21 (run 'hg heads' to see heads, 'hg merge' to merge) |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
22 $ hg up tip |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
23 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
24 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
25 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
26 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
27 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
28 Rebasing D onto H detaching from C: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
29 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
30 $ hg clone -q -u . a a1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
31 $ cd a1 |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
32 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
33 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
34 @ 7: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
35 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
36 | o 6: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
37 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
38 o | 5: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
39 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
40 | o 4: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
41 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
42 | o 3: 'D' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
43 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
44 | o 2: 'C' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
45 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
46 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
47 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
48 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
49 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
50 $ hg rebase --detach -s 3 -d 7 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
51 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
52 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
53 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
54 @ 7: 'D' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
55 | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
56 o 6: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
57 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
58 | o 5: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
59 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
60 o | 4: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
61 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
62 | o 3: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
63 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
64 | o 2: 'C' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
65 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
66 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
67 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
68 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
69 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
70 $ hg manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
71 A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
72 D |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
73 F |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
74 H |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
75 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
76 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
77 |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
78 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
79 Rebasing C onto H detaching from B: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
80 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
81 $ hg clone -q -u . a a2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
82 $ cd a2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
83 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
84 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
85 @ 7: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
86 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
87 | o 6: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
88 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
89 o | 5: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
90 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
91 | o 4: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
92 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
93 | o 3: 'D' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
94 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
95 | o 2: 'C' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
96 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
97 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
98 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
99 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
100 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
101 $ hg rebase --detach -s 2 -d 7 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
102 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
103 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
104 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
105 @ 7: 'D' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
106 | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
107 o 6: 'C' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
108 | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
109 o 5: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
110 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
111 | o 4: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
112 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
113 o | 3: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
114 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
115 | o 2: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
116 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
117 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
118 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
119 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
120 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
121 $ hg manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
122 A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
123 C |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
124 D |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
125 F |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
126 H |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
127 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
128 $ cd .. |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
129 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
130 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
131 Rebasing B onto H using detach (same as not using it): |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
132 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
133 $ hg clone -q -u . a a3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
134 $ cd a3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
135 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
136 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
137 @ 7: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
138 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
139 | o 6: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
140 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
141 o | 5: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
142 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
143 | o 4: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
144 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
145 | o 3: 'D' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
146 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
147 | o 2: 'C' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
148 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
149 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
150 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
151 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
152 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
153 $ hg rebase --detach -s 1 -d 7 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
154 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
155 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
156 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
157 @ 7: 'D' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
158 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
159 o 6: 'C' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
160 | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
161 o 5: 'B' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
162 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
163 o 4: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
164 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
165 | o 3: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
166 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
167 o | 2: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
168 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
169 | o 1: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
170 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
171 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
172 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
173 $ hg manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
174 A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
175 B |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
176 C |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
177 D |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
178 F |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
179 H |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
180 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
181 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
182 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
183 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
184 Rebasing C onto H detaching from B and collapsing: |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
185 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
186 $ hg clone -q -u . a a4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
187 $ cd a4 |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
188 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
189 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
190 @ 7: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
191 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
192 | o 6: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
193 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
194 o | 5: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
195 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
196 | o 4: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
197 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
198 | o 3: 'D' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
199 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
200 | o 2: 'C' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
201 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
202 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
203 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
204 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
205 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
206 $ hg rebase --detach --collapse -s 2 -d 7 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
207 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
10352
66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
208 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
209 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
210 @ 6: 'Collapsed revision |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
211 | * C |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
212 | * D' |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
213 o 5: 'H' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
214 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
215 | o 4: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
216 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
217 o | 3: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
218 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
219 | o 2: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
220 |/ |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
221 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
222 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
223 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
224 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
225 $ hg manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
226 A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
227 C |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
228 D |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
229 F |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
230 H |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
231 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
232 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
233 |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
234 Rebasing across null as ancestor |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
235 $ hg clone -q -U a a5 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
236 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
237 $ cd a5 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
238 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
239 $ echo x > x |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
240 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
241 $ hg add x |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
242 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
243 $ hg ci -m "extra branch" |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
244 created new head |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
245 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
246 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
247 @ 8: 'extra branch' |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
248 |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
249 o 7: 'H' |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
250 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
251 | o 6: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
252 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
253 o | 5: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
254 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
255 | o 4: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
256 |/ |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
257 | o 3: 'D' |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
258 | | |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
259 | o 2: 'C' |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
260 | | |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
261 | o 1: 'B' |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
262 |/ |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
263 o 0: 'A' |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
264 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
265 $ hg rebase --detach -s 1 -d tip |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
266 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
267 |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
268 $ hg tglog |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
269 @ 8: 'D' |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
270 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
271 o 7: 'C' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
272 | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
273 o 6: 'B' |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
274 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
275 o 5: 'extra branch' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
276 |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
277 o 4: 'H' |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
278 | |
14121
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
279 | o 3: 'G' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
280 |/| |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
281 o | 2: 'F' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
282 | | |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
283 | o 1: 'E' |
012c719103ab
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13021
diff
changeset
|
284 |/ |
13021
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
285 o 0: 'A' |
6c800e7ef2f6
rebase: support --detach when null is common ancestor
Henrik Stuart <hg@hstuart.dk>
parents:
12640
diff
changeset
|
286 |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
287 |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
288 $ hg rebase -d 5 -s 7 |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15132
diff
changeset
|
289 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
15132
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
290 $ hg tglog |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
291 @ 8: 'D' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
292 | |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
293 o 7: 'C' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
294 | |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
295 | o 6: 'B' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
296 |/ |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
297 o 5: 'extra branch' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
298 |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
299 o 4: 'H' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
300 | |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
301 | o 3: 'G' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
302 |/| |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
303 o | 2: 'F' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
304 | | |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
305 | o 1: 'E' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
306 |/ |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
307 o 0: 'A' |
81f76098211e
rebase: allow rebase to ancestor (issue3010)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14121
diff
changeset
|
308 |
15464
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
309 $ cd .. |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
310 |
15469
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
311 Verify that target is not selected as external rev (issue3085) |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
312 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
313 $ hg clone -q -U a a6 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
314 $ cd a6 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
315 $ hg up -q 6 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
316 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
317 $ echo "I" >> E |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
318 $ hg ci -m "I" |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
319 $ hg merge 7 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
320 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
321 (branch merge, don't forget to commit) |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
322 $ hg ci -m "Merge" |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
323 $ echo "J" >> F |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
324 $ hg ci -m "J" |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
325 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
326 $ hg rebase -s 8 -d 7 --collapse --detach --config ui.merge=internal:other |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
327 remote changed E which local deleted |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
328 use (c)hanged version or leave (d)eleted? c |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
329 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
330 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
331 $ hg tglog |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
332 @ 8: 'Collapsed revision |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
333 | * I |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
334 | * Merge |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
335 | * J' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
336 o 7: 'H' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
337 | |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
338 | o 6: 'G' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
339 |/| |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
340 o | 5: 'F' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
341 | | |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
342 | o 4: 'E' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
343 |/ |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
344 | o 3: 'D' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
345 | | |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
346 | o 2: 'C' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
347 | | |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
348 | o 1: 'B' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
349 |/ |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
350 o 0: 'A' |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
351 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
352 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
353 $ hg parents |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
354 changeset: 8:9472f4b1d736 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
355 tag: tip |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
356 user: test |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
357 date: Thu Jan 01 00:00:00 1970 +0000 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
358 summary: Collapsed revision |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
359 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
360 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
361 $ cd .. |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
362 |
15464
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
363 Ensure --continue restores a correct state (issue3046): |
15469
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
364 $ hg clone -q a a7 |
ad336e093a59
rebase: ensure target is not taken as external (issue3085)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15464
diff
changeset
|
365 $ cd a7 |
15464
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
366 $ hg up -q 3 |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
367 $ echo 'H2' > H |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
368 $ hg ci -A -m 'H2' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
369 adding H |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
370 $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
371 merging H |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
372 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15471
diff
changeset
|
373 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
15464
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
374 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
375 [255] |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
376 $ hg resolve --all -t internal:local |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
377 $ hg rebase -c |
15520
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15471
diff
changeset
|
378 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
15464
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
379 $ hg tglog |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
380 @ 8: 'H2' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
381 | |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
382 o 7: 'H' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
383 | |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
384 | o 6: 'G' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
385 |/| |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
386 o | 5: 'F' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
387 | | |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
388 | o 4: 'E' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
389 |/ |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
390 | o 3: 'D' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
391 | | |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
392 | o 2: 'C' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
393 | | |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
394 | o 1: 'B' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
395 |/ |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
396 o 0: 'A' |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
397 |
3411a83e232a
rebase: treat nullmerge as a special case in rebasestate (issue3046)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15132
diff
changeset
|
398 |