Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 19925:9c78ed396075
rebase: preserve working directory parent (BC)
Prior to this changeset, rebase always left the working directory as a parent of
the last rebased changeset. The is dubious when, before the rebase, the working
directory was not a parent of the tip most rebased changeset.
With this changeset, we move the working directory back to its original parent.
If the original parent was rebased, we use it's successors.
This is a step toward solving issue3813 (rebase loses active bookmark if it's
not on a head)
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Mon, 14 Oct 2013 16:12:29 +0200 |
parents | c23c62209cc4 |
children | 908c76e84ec5 |
comparison
equal
deleted
inserted
replaced
19924:c23c62209cc4 | 19925:9c78ed396075 |
---|---|
124 $ hg graft 42ccdea3bb16 32af7686d403 | 124 $ hg graft 42ccdea3bb16 32af7686d403 |
125 grafting revision 1 | 125 grafting revision 1 |
126 grafting revision 3 | 126 grafting revision 3 |
127 $ hg rebase -s 42ccdea3bb16 -d . | 127 $ hg rebase -s 42ccdea3bb16 -d . |
128 $ hg log -G | 128 $ hg log -G |
129 @ 10:5ae4c968c6ac C | 129 o 10:5ae4c968c6ac C |
130 | | 130 | |
131 o 9:08483444fef9 D | 131 @ 9:08483444fef9 D |
132 | | 132 | |
133 o 8:8877864f1edb B | 133 o 8:8877864f1edb B |
134 | | 134 | |
135 | o 7:02de42196ebe H | 135 | o 7:02de42196ebe H |
136 | | | 136 | | |
141 o | 4:9520eea781bc E | 141 o | 4:9520eea781bc E |
142 |/ | 142 |/ |
143 o 0:cd010b8cd998 A | 143 o 0:cd010b8cd998 A |
144 | 144 |
145 $ hg log --hidden -G | 145 $ hg log --hidden -G |
146 @ 10:5ae4c968c6ac C | 146 o 10:5ae4c968c6ac C |
147 | | 147 | |
148 o 9:08483444fef9 D | 148 @ 9:08483444fef9 D |
149 | | 149 | |
150 o 8:8877864f1edb B | 150 o 8:8877864f1edb B |
151 | | 151 | |
152 | o 7:02de42196ebe H | 152 | o 7:02de42196ebe H |
153 | | | 153 | | |
207 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 {'date': '* *', 'user': 'test'} (glob) | 207 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 {'date': '* *', 'user': 'test'} (glob) |
208 08483444fef91d6224f6655ee586a65d263ad34c 0 {'date': '* *', 'user': 'test'} (glob) | 208 08483444fef91d6224f6655ee586a65d263ad34c 0 {'date': '* *', 'user': 'test'} (glob) |
209 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 {'date': '* *', 'user': 'test'} (glob) | 209 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 {'date': '* *', 'user': 'test'} (glob) |
210 $ hg log --rev 'divergent()' | 210 $ hg log --rev 'divergent()' |
211 $ hg log -G | 211 $ hg log -G |
212 @ 13:98f6af4ee953 C | 212 o 13:98f6af4ee953 C |
213 | | 213 | |
214 o 12:462a34d07e59 B | 214 o 12:462a34d07e59 B |
215 | | 215 | |
216 o 11:4596109a6a43 D | 216 @ 11:4596109a6a43 D |
217 | | 217 | |
218 o 7:02de42196ebe H | 218 o 7:02de42196ebe H |
219 | | 219 | |
220 | o 6:eea13746799a G | 220 | o 6:eea13746799a G |
221 |/| | 221 |/| |
250 updating to branch default | 250 updating to branch default |
251 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 251 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
252 $ cd collapse | 252 $ cd collapse |
253 $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse | 253 $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse |
254 $ hg log -G | 254 $ hg log -G |
255 @ 8:4dc2197e807b Collapsed revision | 255 o 8:4dc2197e807b Collapsed revision |
256 | | 256 | |
257 | o 7:02de42196ebe H | 257 | @ 7:02de42196ebe H |
258 | | | 258 | | |
259 o | 6:eea13746799a G | 259 o | 6:eea13746799a G |
260 |\| | 260 |\| |
261 | o 5:24b6387c8c8c F | 261 | o 5:24b6387c8c8c F |
262 | | | 262 | | |
263 o | 4:9520eea781bc E | 263 o | 4:9520eea781bc E |
264 |/ | 264 |/ |
265 o 0:cd010b8cd998 A | 265 o 0:cd010b8cd998 A |
266 | 266 |
267 $ hg log --hidden -G | 267 $ hg log --hidden -G |
268 @ 8:4dc2197e807b Collapsed revision | 268 o 8:4dc2197e807b Collapsed revision |
269 | | 269 | |
270 | o 7:02de42196ebe H | 270 | @ 7:02de42196ebe H |
271 | | | 271 | | |
272 o | 6:eea13746799a G | 272 o | 6:eea13746799a G |
273 |\| | 273 |\| |
274 | o 5:24b6387c8c8c F | 274 | o 5:24b6387c8c8c F |
275 | | | 275 | | |
303 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 303 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
304 $ cd hidden | 304 $ cd hidden |
305 $ hg rebase -s 5fddd98957c8 -d eea13746799a | 305 $ hg rebase -s 5fddd98957c8 -d eea13746799a |
306 $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe | 306 $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe |
307 $ hg log -G | 307 $ hg log -G |
308 @ 10:7c6027df6a99 B | 308 o 10:7c6027df6a99 B |
309 | | 309 | |
310 | o 9:cf44d2f5a9f4 D | 310 | o 9:cf44d2f5a9f4 D |
311 | | | 311 | | |
312 | o 8:e273c5e7d2d2 C | 312 | o 8:e273c5e7d2d2 C |
313 | | | 313 | | |
314 o | 7:02de42196ebe H | 314 @ | 7:02de42196ebe H |
315 | | | 315 | | |
316 | o 6:eea13746799a G | 316 | o 6:eea13746799a G |
317 |/| | 317 |/| |
318 o | 5:24b6387c8c8c F | 318 o | 5:24b6387c8c8c F |
319 | | | 319 | | |
320 | o 4:9520eea781bc E | 320 | o 4:9520eea781bc E |
321 |/ | 321 |/ |
322 o 0:cd010b8cd998 A | 322 o 0:cd010b8cd998 A |
323 | 323 |
324 $ hg log --hidden -G | 324 $ hg log --hidden -G |
325 @ 10:7c6027df6a99 B | 325 o 10:7c6027df6a99 B |
326 | | 326 | |
327 | o 9:cf44d2f5a9f4 D | 327 | o 9:cf44d2f5a9f4 D |
328 | | | 328 | | |
329 | o 8:e273c5e7d2d2 C | 329 | o 8:e273c5e7d2d2 C |
330 | | | 330 | | |
331 o | 7:02de42196ebe H | 331 @ | 7:02de42196ebe H |
332 | | | 332 | | |
333 | o 6:eea13746799a G | 333 | o 6:eea13746799a G |
334 |/| | 334 |/| |
335 o | 5:24b6387c8c8c F | 335 o | 5:24b6387c8c8c F |
336 | | | 336 | | |
354 | 354 |
355 $ hg log -r 'children(8)' | 355 $ hg log -r 'children(8)' |
356 9:cf44d2f5a9f4 D (no-eol) | 356 9:cf44d2f5a9f4 D (no-eol) |
357 $ hg rebase -r 8 | 357 $ hg rebase -r 8 |
358 $ hg log -G | 358 $ hg log -G |
359 @ 11:0d8f238b634c C | 359 o 11:0d8f238b634c C |
360 | | 360 | |
361 o 10:7c6027df6a99 B | 361 o 10:7c6027df6a99 B |
362 | | 362 | |
363 | o 9:cf44d2f5a9f4 D | 363 | o 9:cf44d2f5a9f4 D |
364 | | | 364 | | |
365 | x 8:e273c5e7d2d2 C | 365 | x 8:e273c5e7d2d2 C |
366 | | | 366 | | |
367 o | 7:02de42196ebe H | 367 @ | 7:02de42196ebe H |
368 | | | 368 | | |
369 | o 6:eea13746799a G | 369 | o 6:eea13746799a G |
370 |/| | 370 |/| |
371 o | 5:24b6387c8c8c F | 371 o | 5:24b6387c8c8c F |
372 | | | 372 | | |
379 Test multiple root handling | 379 Test multiple root handling |
380 ------------------------------------ | 380 ------------------------------------ |
381 | 381 |
382 $ hg rebase --dest 4 --rev '7+11+9' | 382 $ hg rebase --dest 4 --rev '7+11+9' |
383 $ hg log -G | 383 $ hg log -G |
384 @ 14:1e8370e38cca C | 384 o 14:1e8370e38cca C |
385 | | 385 | |
386 | o 13:102b4c1d889b D | 386 | o 13:102b4c1d889b D |
387 | | | 387 | | |
388 o | 12:bfe264faf697 H | 388 @ | 12:bfe264faf697 H |
389 |/ | 389 |/ |
390 | o 10:7c6027df6a99 B | 390 | o 10:7c6027df6a99 B |
391 | | | 391 | | |
392 | x 7:02de42196ebe H | 392 | x 7:02de42196ebe H |
393 | | | 393 | | |