Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-imerge @ 5124:06154aff2b1a
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 08 Aug 2007 23:00:01 +0200 |
parents | 12930b97a729 |
children | 9cd6578750b9 |
comparison
equal
deleted
inserted
replaced
5123:f94dbc6c7eaf | 5124:06154aff2b1a |
---|---|
1 #!/bin/sh | |
2 | |
3 echo "[extensions]" >> $HGRCPATH | |
4 echo "imerge=" >> $HGRCPATH | |
5 HGMERGE=true | |
6 export HGMERGE | |
7 | |
8 hg init base | |
9 cd base | |
10 | |
11 echo foo > foo | |
12 echo bar > bar | |
13 hg ci -Am0 -d '0 0' | |
14 | |
15 hg mv foo foo2 | |
16 echo foo >> foo2 | |
17 hg ci -m1 -d '1 0' | |
18 | |
19 hg up -C 0 | |
20 echo bar >> foo | |
21 echo bar >> bar | |
22 hg ci -m2 -d '2 0' | |
23 | |
24 echo % start imerge | |
25 hg imerge | |
26 | |
27 cat foo2 | |
28 cat bar | |
29 | |
30 echo % status -v | |
31 hg -v imerge st | |
32 | |
33 echo % next | |
34 hg imerge next | |
35 | |
36 echo % merge next | |
37 hg --traceback imerge | |
38 | |
39 echo % unresolve | |
40 hg imerge unres foo | |
41 | |
42 echo % merge foo | |
43 hg imerge merge foo | |
44 | |
45 echo % save | |
46 echo foo > foo2 | |
47 hg imerge save ../savedmerge | |
48 | |
49 echo % load | |
50 hg up -C 0 | |
51 hg imerge --traceback load ../savedmerge | |
52 cat foo2 | |
53 | |
54 hg ci -m'merged' -d '3 0' | |
55 hg tip -v | |
56 | |
57 echo % nothing to merge | |
58 hg imerge | |
59 | |
60 exit 0 |