Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-manifest-merging @ 3351:50a18815e3f0
Revert changeset c67920d78248.
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Tue, 10 Oct 2006 21:03:24 +0300 |
parents | |
children | be8efb6e1cc6 |
line wrap: on
line source
#!/bin/sh echo % init foo-base hg init foo-base echo % create alpha in first repo cd foo-base echo 'alpha' > alpha hg ci -A -m 'add alpha' -d '1 0' cd .. echo % clone foo-base to foo-work hg clone foo-base foo-work echo % create beta in second repo cd foo-work echo 'beta' > beta hg ci -A -m 'add beta' -d '2 0' cd .. echo % create gamma in first repo cd foo-base echo 'gamma' > gamma hg ci -A -m 'add gamma' -d '3 0' cd .. echo % pull into work and merge cd foo-work hg pull hg merge echo % revert to changeset 1 to simulate a failed merge rm -fr * hg up -C 1