tests: test-parseindex.t works just fine with chg
In
538e850ae737 I annotated tests that failed with chg with "#require no-chg",
but did not investigate why the tests were failing. This test was failing for
unrelated reasons (I forgot to rebuild hg) and so should not be marked as
no-chg.
Test Plan:
make local
pushd contrib/chg
make clean; make
popd
cd tests
for f in '' --with-chg=../contrib/chg/chg; do
./run-tests.py --local $f test-parseindex.t
done
Differential Revision: https://phab.mercurial-scm.org/D3571
$ hg init base
$ cd base
$ echo 'alpha' > alpha
$ hg ci -A -m 'add alpha'
adding alpha
$ cd ..
$ hg clone base work
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd work
$ echo 'beta' > beta
$ hg ci -A -m 'add beta'
adding beta
$ cd ..
$ cd base
$ echo 'gamma' > gamma
$ hg ci -A -m 'add gamma'
adding gamma
$ cd ..
$ cd work
$ hg pull -q
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Update --clean to revision 1 to simulate a failed merge:
$ rm alpha beta gamma
$ hg update --clean 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..