Mercurial > hg
annotate tests/test-imerge @ 6380:a632a9a57821
qclone: do not abort if remote hasn't enabled mq (issue1040)
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Mar 2008 16:17:19 -0300 |
parents | bbfebf751ac8 |
children |
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 | |
6363
bbfebf751ac8
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents:
6362
diff
changeset
|
36 echo % resolve and unresolve |
bbfebf751ac8
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents:
6362
diff
changeset
|
37 hg imerge resolve foo |
bbfebf751ac8
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents:
6362
diff
changeset
|
38 hg -v imerge st |
bbfebf751ac8
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents:
6362
diff
changeset
|
39 hg imerge unresolve foo |
bbfebf751ac8
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents:
6362
diff
changeset
|
40 hg -v imerge st |
bbfebf751ac8
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents:
6362
diff
changeset
|
41 |
5044 | 42 echo % merge next |
5109 | 43 hg --traceback imerge |
5044 | 44 |
45 echo % unresolve | |
46 hg imerge unres foo | |
47 | |
48 echo % merge foo | |
49 hg imerge merge foo | |
50 | |
51 echo % save | |
5109 | 52 echo foo > foo2 |
5044 | 53 hg imerge save ../savedmerge |
54 | |
6362
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
55 echo % merge auto |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
56 hg up -C 1 |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
57 hg --traceback imerge --auto |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
58 cat foo2 |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6213
diff
changeset
|
59 |
5044 | 60 echo % load |
61 hg up -C 0 | |
62 hg imerge --traceback load ../savedmerge | |
5109 | 63 cat foo2 |
5044 | 64 |
65 hg ci -m'merged' -d '3 0' | |
66 hg tip -v | |
67 | |
5242
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
68 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
|
69 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
|
70 |
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
71 hg up 0 |
5044 | 72 echo % nothing to merge |
73 hg imerge | |
74 | |
6213
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
75 cd .. |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
76 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
|
77 cd clone |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
78 echo % load unknown parent |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
79 hg imerge load ../savedmerge |
5c5e45766224
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents:
5242
diff
changeset
|
80 |
5044 | 81 exit 0 |