Mercurial > hg
annotate tests/test-imerge @ 6362:bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Mar 2008 20:37:02 +0100 |
parents | 5c5e45766224 |
children | bbfebf751ac8 |
rev | line source |
---|---|
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 | |
6362
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
49 echo % merge auto |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
50 hg up -C 1 |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
51 hg --traceback imerge --auto |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
52 cat foo2 |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
53 |
5044 | 54 echo % load |
55 hg up -C 0 | |
56 hg imerge --traceback load ../savedmerge | |
5109 | 57 cat foo2 |
5044 | 58 |
59 hg ci -m'merged' -d '3 0' | |
60 hg tip -v | |
61 | |
5242
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
62 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
|
63 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
|
64 |
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
65 hg up 0 |
5044 | 66 echo % nothing to merge |
67 hg imerge | |
68 | |
6213
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
69 cd .. |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
70 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
|
71 cd clone |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
72 echo % load unknown parent |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
73 hg imerge load ../savedmerge |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
74 |
5044 | 75 exit 0 |