Mercurial > hg
view tests/test-manifest-merging.t @ 26914:6839f2d4eea7
test: enforce generaldelta format with the right option
The option that will become true by default is now 'usegeneraldelta' We have to
adjust the change made in b75fed55f6dc to actually achieve its goal.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 12 Nov 2015 02:52:19 -0800 |
parents | f2719b387380 |
children |
line wrap: on
line source
$ 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 ..