mercurial-crew-with-dirclash: tests/test-merge4@a6ffcebd3315

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-merge4

author	Bryan O'Sullivan <bos@serpentine.com>
	Wed, 21 Sep 2005 11:44:08 -0700
changeset 1293	a6ffcebd3315
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x

Enhance the file filtering capabilities. We now allow filtering through either pipes or pairs of temporary files. The latter appear to be mandatory for use on Windows.


#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "0 0"
hg update -m 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "0 0"

mercurial-crew-with-dirclash

RSS Atom