Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-manifest-merging @ 3457:fab28100ea88
Added extra changeset info to templater and map-cmdline.default.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 18 Oct 2006 18:09:32 +0200 |
parents | be8efb6e1cc6 |
children | a8eb050c6489 |
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 -q hg merge echo % revert to changeset 1 to simulate a failed merge rm -fr * hg up -C 1