Mercurial > hg
comparison tests/test-absorb-strip.t @ 41812:c91321e86071
absorb: use scmutil.cleanupnodes() also when obsmarkers are disabled
A side-effect of this is the new warning in the test case, but the
warning is valid, so I don't think that's a problem.
Differential Revision: https://phab.mercurial-scm.org/D6035
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 27 Feb 2019 16:33:15 -0800 |
parents | 31dfa7dac4c9 |
children |
comparison
equal
deleted
inserted
replaced
41811:a008e0af892e | 41812:c91321e86071 |
---|---|
21 | 21 |
22 $ hg up E -q | 22 $ hg up E -q |
23 $ echo 1 >> B | 23 $ echo 1 >> B |
24 $ echo 2 >> D | 24 $ echo 2 >> D |
25 $ hg absorb -a | 25 $ hg absorb -a |
26 warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60 | |
26 saved backup bundle to * (glob) | 27 saved backup bundle to * (glob) |
27 2 of 2 chunk(s) applied | 28 2 of 2 chunk(s) applied |
28 | 29 |
29 $ hg log -G -T '{desc}' | 30 $ hg log -G -T '{desc}' |
30 @ E | 31 @ E |