author | Eric Hopper <hopper@omnifarious.org> |
Fri, 21 Mar 2008 08:46:15 -0700 | |
changeset 6341 | 63bdfcc3eaaf |
parent 6213 | 5c5e45766224 |
child 6362 | bc3dbdb1d430 |
permissions | -rwxr-xr-x |
5044 | 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 |
||
5109 | 15 |
hg mv foo foo2 |
16 |
echo foo >> foo2 |
|
5044 | 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 |
||
5109 | 27 |
cat foo2 |
5044 | 28 |
cat bar |
29 |
||
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5109
diff
changeset
|
30 |
echo % status -v |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5109
diff
changeset
|
31 |
hg -v imerge st |
5044 | 32 |
|
5109 | 33 |
echo % next |
34 |
hg imerge next |
|
35 |
||
5044 | 36 |
echo % merge next |
5109 | 37 |
hg --traceback imerge |
5044 | 38 |
|
39 |
echo % unresolve |
|
40 |
hg imerge unres foo |
|
41 |
||
42 |
echo % merge foo |
|
43 |
hg imerge merge foo |
|
44 |
||
45 |
echo % save |
|
5109 | 46 |
echo foo > foo2 |
5044 | 47 |
hg imerge save ../savedmerge |
48 |
||
49 |
echo % load |
|
50 |
hg up -C 0 |
|
51 |
hg imerge --traceback load ../savedmerge |
|
5109 | 52 |
cat foo2 |
5044 | 53 |
|
54 |
hg ci -m'merged' -d '3 0' |
|
55 |
hg tip -v |
|
56 |
||
5242
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
57 |
echo % nothing to merge -- tip |
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
58 |
hg imerge |
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
59 |
|
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
60 |
hg up 0 |
5044 | 61 |
echo % nothing to merge |
62 |
hg imerge |
|
63 |
||
6213
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
64 |
cd .. |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
65 |
hg -q clone -r 0 base clone |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
66 |
cd clone |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
67 |
echo % load unknown parent |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
68 |
hg imerge load ../savedmerge |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
69 |
|
5044 | 70 |
exit 0 |