Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-manifest-merging @ 3352:be8efb6e1cc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make manifest-merging test reproduceable
author Matt Mackall <mpm@selenic.com>
date Wed, 11 Oct 2006 15:52:08 -0500
parents 50a18815e3f0
children a8eb050c6489
comparison
equal deleted inserted replaced
3351:50a18815e3f0 3352:be8efb6e1cc6
24 hg ci -A -m 'add gamma' -d '3 0' 24 hg ci -A -m 'add gamma' -d '3 0'
25 cd .. 25 cd ..
26 26
27 echo % pull into work and merge 27 echo % pull into work and merge
28 cd foo-work 28 cd foo-work
29 hg pull 29 hg pull -q
30 hg merge 30 hg merge
31 31
32 echo % revert to changeset 1 to simulate a failed merge 32 echo % revert to changeset 1 to simulate a failed merge
33 rm -fr * 33 rm -fr *
34 hg up -C 1 34 hg up -C 1