102 $ hg debugsuccessors |
102 $ hg debugsuccessors |
103 03f31481307a a7773ffa7edc |
103 03f31481307a a7773ffa7edc |
104 076e9b2ffbe1 a7773ffa7edc |
104 076e9b2ffbe1 a7773ffa7edc |
105 102a90ea7b4a 03f017c74faa |
105 102a90ea7b4a 03f017c74faa |
106 4e322f7ce8e3 000000000000 |
106 4e322f7ce8e3 000000000000 |
|
107 |
|
108 Test rebase --abort |
|
109 |
|
110 $ hg debugsuccessors > ../successors.old |
|
111 $ hg up 0 |
|
112 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
113 $ echo d > d |
|
114 $ hg ci -Am addd d |
|
115 created new head |
|
116 $ echo b >> a |
|
117 $ hg ci -m appendab |
|
118 $ hg rebase -d 1 |
|
119 merging a |
|
120 warning: conflicts during merge. |
|
121 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
122 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
123 [255] |
|
124 $ hg rebase --abort |
|
125 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg |
|
126 rebase aborted |
|
127 $ hg debugsuccessors > ../successors.new |
|
128 $ diff -u ../successors.old ../successors.new |
|
129 |
|
130 Test rebase --continue |
|
131 |
|
132 $ hg rebase -d 1 |
|
133 merging a |
|
134 warning: conflicts during merge. |
|
135 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
136 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
137 [255] |
|
138 $ hg resolve --tool internal:other a |
|
139 $ hg rebase --continue |
|
140 $ glog --hidden |
|
141 @ 11:1951ead97108@default(draft) appendab |
|
142 | |
|
143 o 10:03f165c84ea8@default(draft) addd |
|
144 | |
|
145 | o 9:4b9d80f48523@default(secret) appendab |
|
146 | | |
|
147 | o 8:a31943eabc43@default(secret) addd |
|
148 | | |
|
149 +---o 7:a7773ffa7edc@default(draft) Collapsed revision |
|
150 | | |
|
151 | | o 6:03f31481307a@default(secret) changec |
|
152 | | | |
|
153 | | o 5:076e9b2ffbe1@default(secret) addc |
|
154 | |/ |
|
155 | | o 4:4e322f7ce8e3@foo(secret) changea |
|
156 | |/ |
|
157 +---o 3:03f017c74faa@default(draft) addb |
|
158 | | |
|
159 | | o 2:102a90ea7b4a@default(secret) addb |
|
160 | |/ |
|
161 o | 1:540395c44225@default(draft) changea |
|
162 |/ |
|
163 o 0:07f494440405@default(draft) adda |
|
164 |
|
165 $ hg debugsuccessors > ../successors.new |
|
166 $ diff -u ../successors.old ../successors.new |
|
167 --- ../successors.old* (glob) |
|
168 +++ ../successors.new* (glob) |
|
169 @@ -1,4 +1,6 @@ |
|
170 03f31481307a a7773ffa7edc |
|
171 076e9b2ffbe1 a7773ffa7edc |
|
172 102a90ea7b4a 03f017c74faa |
|
173 +4b9d80f48523 1951ead97108 |
|
174 4e322f7ce8e3 000000000000 |
|
175 +a31943eabc43 03f165c84ea8 |
|
176 [1] |