test-writecg2.t update output matching changes in core

Summary:
Bundle format seems to have changed in core, test-writecg2's output
consequently changed. We have been hotfixing this test for the past two
releases, this patch fixes it in trunk.

Test Plan: Test is passing

Reviewers: ericsumner

Differential Revision: https://phabricator.fb.com/D2793776
This commit is contained in:
Laurent Charignon 2015-12-29 15:17:54 -08:00
parent 26a8911e9e
commit f359b04e95

View File

@ -36,7 +36,7 @@ a strip bundle should be changegroup2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0e067c57feba-3c242e3d-backup.hg (glob)
$ head -c 6 .hg/strip-backup/0e067c57feba-3c242e3d-backup.hg
HG10BZ (no-eol)
HG20\x00\x00 (no-eol) (esc)
applying bundle1 should continue to work
$ hg unbundle ../bundle.bundle
@ -71,7 +71,7 @@ applying bundle1 should continue to work
$ hg strip 1
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0e067c57feba-3c242e3d-backup.hg (glob)
$ head -c 6 .hg/strip-backup/0e067c57feba-3c242e3d-backup.hg
HG10BZ (no-eol)
HG20\x00\x00 (no-eol) (esc)
hg incoming on a changegroup2 should work
$ hg incoming .hg/strip-backup/0e067c57feba-3c242e3d-backup.hg --traceback
@ -100,7 +100,7 @@ applying a changegroup2 should work via unbundle
$ hg strip 1
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0e067c57feba-3c242e3d-backup.hg (glob)
$ head -c 6 .hg/strip-backup/0e067c57feba-3c242e3d-backup.hg
HG10BZ (no-eol)
HG20\x00\x00 (no-eol) (esc)
$ hg pull .hg/strip-backup/0e067c57feba-3c242e3d-backup.hg
pulling from .hg/strip-backup/0e067c57feba-3c242e3d-backup.hg
searching for changes
@ -116,7 +116,7 @@ amends should also be cg2
$ touch d && hg add d && hg ci --amend -mcd
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/991a3460af53-046ba7e5-amend-backup.hg (glob)
$ head -c 6 .hg/strip-backup/991a3460af53-046ba7e5-amend-backup.hg
HG10BZ (no-eol)
HG20\x00\x00 (no-eol) (esc)
turn on bundle2
$ cat >> $HGRCPATH <<EOF
@ -147,8 +147,10 @@ strip should produce bundle2
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0e067c57feba-1954568c-backup.hg (glob)
$ hg debugbundle .hg/strip-backup/0e067c57feba-1954568c-backup.hg
0e067c57feba1a5694ca4844f05588bb1bf82342
b2a74d690cb63a443d20de84bdc9eb5a7ddbedac
Stream params: {'Compression': 'BZ'}
changegroup -- "{'version': '02'}"
0e067c57feba1a5694ca4844f05588bb1bf82342
b2a74d690cb63a443d20de84bdc9eb5a7ddbedac
$ hg incoming .hg/strip-backup/0e067c57feba-1954568c-backup.hg
comparing with .hg/strip-backup/0e067c57feba-1954568c-backup.hg
searching for changes