Mercurial > hg
comparison tests/test-rebase-abort.t @ 12608:16b854cb80f1
tests: unify test-rebase*
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 01 Oct 2010 16:10:06 +0200 |
parents | tests/test-rebase-abort@7fa3968004c1 |
children | 6cc4b14fb76b |
comparison
equal
deleted
inserted
replaced
12607:1393a81b3bdc | 12608:16b854cb80f1 |
---|---|
1 $ cat >> $HGRCPATH <<EOF | |
2 > [extensions] | |
3 > graphlog= | |
4 > rebase= | |
5 > | |
6 > [alias] | |
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | |
8 > EOF | |
9 | |
10 | |
11 $ hg init a | |
12 $ cd a | |
13 | |
14 $ echo c1 > common | |
15 $ hg add common | |
16 $ hg ci -m C1 | |
17 | |
18 $ echo c2 >> common | |
19 $ hg ci -m C2 | |
20 | |
21 $ echo c3 >> common | |
22 $ hg ci -m C3 | |
23 | |
24 $ hg up -q -C 1 | |
25 | |
26 $ echo l1 >> extra | |
27 $ hg add extra | |
28 $ hg ci -m L1 | |
29 created new head | |
30 | |
31 $ sed -e 's/c2/l2/' common > common.new | |
32 $ mv common.new common | |
33 $ hg ci -m L2 | |
34 | |
35 $ hg tglog | |
36 @ 4: 'L2' | |
37 | | |
38 o 3: 'L1' | |
39 | | |
40 | o 2: 'C3' | |
41 |/ | |
42 o 1: 'C2' | |
43 | | |
44 o 0: 'C1' | |
45 | |
46 | |
47 Conflicting rebase: | |
48 | |
49 $ hg rebase -s 3 -d 2 | |
50 merging common | |
51 warning: conflicts during merge. | |
52 merging common failed! | |
53 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
54 [255] | |
55 | |
56 Abort: | |
57 | |
58 $ hg rebase --abort | |
59 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | |
60 rebase aborted | |
61 | |
62 $ hg tglog | |
63 @ 4: 'L2' | |
64 | | |
65 o 3: 'L1' | |
66 | | |
67 | o 2: 'C3' | |
68 |/ | |
69 o 1: 'C2' | |
70 | | |
71 o 0: 'C1' | |
72 | |
73 $ cd .. | |
74 | |
75 | |
76 Constrcut new repo: | |
77 | |
78 $ hg init b | |
79 $ cd b | |
80 | |
81 $ echo a > a | |
82 $ hg ci -Am A | |
83 adding a | |
84 | |
85 $ echo b > b | |
86 $ hg ci -Am B | |
87 adding b | |
88 | |
89 $ echo c > c | |
90 $ hg ci -Am C | |
91 adding c | |
92 | |
93 $ hg up -q 0 | |
94 | |
95 $ echo b > b | |
96 $ hg ci -Am 'B bis' | |
97 adding b | |
98 created new head | |
99 | |
100 $ echo c1 > c | |
101 $ hg ci -Am C1 | |
102 adding c | |
103 | |
104 Rebase and abort without generating new changesets: | |
105 | |
106 $ hg tglog | |
107 @ 4: 'C1' | |
108 | | |
109 o 3: 'B bis' | |
110 | | |
111 | o 2: 'C' | |
112 | | | |
113 | o 1: 'B' | |
114 |/ | |
115 o 0: 'A' | |
116 | |
117 $ hg rebase -b 4 -d 2 | |
118 merging c | |
119 warning: conflicts during merge. | |
120 merging c failed! | |
121 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
122 [255] | |
123 | |
124 $ hg tglog | |
125 @ 4: 'C1' | |
126 | | |
127 o 3: 'B bis' | |
128 | | |
129 | @ 2: 'C' | |
130 | | | |
131 | o 1: 'B' | |
132 |/ | |
133 o 0: 'A' | |
134 | |
135 $ hg rebase -a | |
136 rebase aborted | |
137 | |
138 $ hg tglog | |
139 @ 4: 'C1' | |
140 | | |
141 o 3: 'B bis' | |
142 | | |
143 | o 2: 'C' | |
144 | | | |
145 | o 1: 'B' | |
146 |/ | |
147 o 0: 'A' | |
148 |