Mercurial > hg
comparison tests/test-imerge @ 5046:ed68c8c31c9a
Automated merge with http://hg.intevation.org/mercurial/crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 01 Aug 2007 12:03:50 -0700 |
parents | 58006f8b8275 |
children | 86327d13d916 |
comparison
equal
deleted
inserted
replaced
5045:8b1ee1f59b3c | 5046:ed68c8c31c9a |
---|---|
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 echo foo >> foo | |
16 hg ci -m1 -d '1 0' | |
17 | |
18 hg up -C 0 | |
19 echo bar >> foo | |
20 echo bar >> bar | |
21 hg ci -m2 -d '2 0' | |
22 | |
23 echo % start imerge | |
24 hg imerge | |
25 | |
26 cat foo | |
27 cat bar | |
28 | |
29 echo % status | |
30 hg imerge st | |
31 | |
32 echo % merge next | |
33 hg imerge | |
34 | |
35 echo % unresolve | |
36 hg imerge unres foo | |
37 | |
38 echo % merge foo | |
39 hg imerge merge foo | |
40 | |
41 echo % save | |
42 echo foo > foo | |
43 hg imerge save ../savedmerge | |
44 | |
45 echo % load | |
46 hg up -C 0 | |
47 hg imerge --traceback load ../savedmerge | |
48 cat foo | |
49 | |
50 hg ci -m'merged' -d '3 0' | |
51 hg tip -v | |
52 | |
53 echo % nothing to merge | |
54 hg imerge | |
55 | |
56 exit 0 |