Mercurial > hg
changeset 39326:63aa928be559
tests: add log output after stripping for context for next test
It's not obvious what the repo state will be after stripping some
nodes and obsmarkers, so let's include the log output to make it
easier to follow the test case that comes after.
Differential Revision: https://phab.mercurial-scm.org/D4406
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 27 Aug 2018 10:44:43 -0700 |
| parents | 93175cba7edd |
| children | a3af500a1362 |
| files | tests/test-rebase-obsolete.t |
| diffstat | 1 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Tue Aug 28 15:09:18 2018 -0700 +++ b/tests/test-rebase-obsolete.t Mon Aug 27 10:44:43 2018 -0700 @@ -1123,6 +1123,23 @@ o 0:b173517d0057 a $ hg strip -r 8: + $ hg log -G -r 'a':: + * 7:1143e9adc121 f + | + | o 6:d60ebfa0f1cb e + | | + | o 5:027ad6c5830d d' + | | + x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d) + |/ + o 3:a82ac2b38757 c + | + | o 2:630d7c95eff7 x + | | + o | 1:488e1b7e7341 b + |/ + o 0:b173517d0057 a + If the rebase set has an obsolete (d) with a successor (d') outside the rebase set and none in destination, we still get the divergence warning.