Mercurial > hg
changeset 44557:254c5f71e2df
tests: fix rebase test broken by earlier cleanup
It turns out I broke one of the rebase tests in dd2833e4d660 (tests:
use drawdag in test-rebase-collapse.t, 2018-03-18) and didn't notice
until now.
Differential Revision: https://phab.mercurial-scm.org/D8277
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 12 Mar 2020 14:50:00 -0700 |
| parents | f63598aa1c4b |
| children | ea40fea992e0 |
| files | tests/test-rebase-collapse.t |
| diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t Fri Mar 13 16:57:38 2020 -0700 +++ b/tests/test-rebase-collapse.t Thu Mar 12 14:50:00 2020 -0700 @@ -184,33 +184,33 @@ Rebase and collapse - E onto H: - $ hg rebase -s E --dest I --collapse # root (E) is not a merge - abort: unknown revision 'I'! - [255] + $ hg rebase -s E --dest H --collapse # root (E) is not a merge + rebasing 5:49cb92066bfd "E" (E) + rebasing 6:11abe3fb10b8 "F" (F) + rebasing 7:64e264db77f0 "G" (G tip) + saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg $ hg tglog - o 7: 64e264db77f0 'G' - |\ - | o 6: 11abe3fb10b8 'F' - | | - | o 5: 49cb92066bfd 'E' + o 5: 8b2315790719 'Collapsed revision + |\ * E + | | * F + | | * G' + | o 4: 4e4f9194f9f1 'D' + | |\ + o | | 3: 575c4b5ec114 'H' + | | | + +---o 2: dc0947a82db8 'C' | | - o | 4: 4e4f9194f9f1 'D' - |\| - | | o 3: 575c4b5ec114 'H' - | | | - o---+ 2: dc0947a82db8 'C' - / / - o / 1: 112478962961 'B' + | o 1: 112478962961 'B' |/ o 0: 426bada5c675 'A' $ hg manifest --rev tip A - B C E F + H $ cd ..