This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4406

tests: add log output after stripping for context for next test
ClosedPublic

Authored by martinvonz on Aug 28 2018, 3:33 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG63aa928be559: tests: add log output after stripping for context for next test
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-obsolete.t (17 lines)

Diff 10640

tests/test-rebase-obsolete.t

| | | |
o | 2:630d7c95eff7 x o | 2:630d7c95eff7 x
| | | |
| x 1:488e1b7e7341 b (rewritten using rebase as 8:67e8f4a16c49) | x 1:488e1b7e7341 b (rewritten using rebase as 8:67e8f4a16c49)
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg strip -r 8: $ 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 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. set and none in destination, we still get the divergence warning.
By allowing divergence, we can perform the rebase. By allowing divergence, we can perform the rebase.
$ hg rebase -r 'c'::'f' -d 'x' $ hg rebase -r 'c'::'f' -d 'x'
abort: this rebase will cause divergences from: 76be324c128b abort: this rebase will cause divergences from: 76be324c128b
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)