Mercurial > hg-stable
comparison tests/test-rebase-obsolete.t @ 19924:c23c62209cc4
tests: prepare rebase test for wc parent preservation
In the way to solving issue3813 we'll preserve the working directory parent
after the rebase. Multiple rebases test expect the working directory parent to
be tip after rebase. We patches them before the actual change to prevent
confusion.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Mon, 14 Oct 2013 16:49:54 +0200 |
parents | a69a77a80900 |
children | 9c78ed396075 |
comparison
equal
deleted
inserted
replaced
19923:52bc80d0769f | 19924:c23c62209cc4 |
---|---|
281 | | | 281 | | |
282 | x 1:42ccdea3bb16 B | 282 | x 1:42ccdea3bb16 B |
283 |/ | 283 |/ |
284 o 0:cd010b8cd998 A | 284 o 0:cd010b8cd998 A |
285 | 285 |
286 $ hg id --debug | 286 $ hg id --debug -r tip |
287 4dc2197e807bae9817f09905b50ab288be2dbbcf tip | 287 4dc2197e807bae9817f09905b50ab288be2dbbcf tip |
288 $ hg debugobsolete | 288 $ hg debugobsolete |
289 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) | 289 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) |
290 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) | 290 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) |
291 32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) | 291 32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob) |