Mercurial > hg
diff tests/test-rebase-conflicts.t @ 37336:5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
`hg pull <bundle>` uses the special "bundlerepo" repository. The
bundlerepo code makes many assumptions about the storage of
repositories. It will be difficult to teach bundlerepo to use
non-revlog storage before a better storage interface is established.
Many test failures using our "simple store" are related to
bundlerepo: the simple store just isn't compatible with bundlerepo
because of storage assumptions in bundlerepo.
In order to mitigate the impact of bundlerepo on our code base,
this commit changes various tests to use `hg unbundle` instead
of `hg pull`. This bypasses the bundlerepo code.
Tests exercising exchange functionality have not been altered, as
they should be using `hg pull` and going through the bundlerepo
code paths.
Differential Revision: https://phab.mercurial-scm.org/D3059
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 03 Apr 2018 13:56:09 -0700 |
parents | db06c4bb2158 |
children | 326b174c6a47 |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Wed Apr 04 09:41:18 2018 -0700 +++ b/tests/test-rebase-conflicts.t Tue Apr 03 13:56:09 2018 -0700 @@ -148,16 +148,17 @@ Check that the right ancestors is used while rebasing a merge (issue4041) - $ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041 - requesting all changes + $ hg init issue4041 + $ cd issue4041 + $ hg unbundle "$TESTDIR/bundles/issue4041.hg" adding changesets adding manifests adding file changes added 11 changesets with 8 changes to 3 files (+1 heads) new changesets 24797d4f68de:2f2496ddf49d - updating to branch default + (run 'hg heads' to see heads) + $ hg up default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd issue4041 $ hg log -G o changeset: 10:2f2496ddf49d |\ branch: f1