| author | TK Soh <teekaysoh@gmail.com> |
| Thu, 08 Oct 2009 09:27:22 +0800 | |
| changeset 9550 | 3bcb28131bab |
| parent 8940 | 01ada7b1861d |
| permissions | -rw-r--r-- |
|
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 |
adding file1 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 |
adding file2 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5764
diff
changeset
|
4 |
created new head |
|
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 |
|
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
6 |
# non-interactive merge |
|
8940
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
6336
diff
changeset
|
7 |
local changed file1 which remote deleted |
|
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
6336
diff
changeset
|
8 |
use (c)hanged version or (d)elete? c |
|
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
6336
diff
changeset
|
9 |
remote changed file2 which local deleted |
|
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
6336
diff
changeset
|
10 |
use (c)hanged version or leave (d)eleted? c |
|
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
11 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
12 |
(branch merge, don't forget to commit) |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
13 |
status: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 |
M file2 |
|
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
15 |
C file1 |
|
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
16 |
file1: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
17 |
1 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
18 |
changed |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
19 |
file2: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 |
2 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
21 |
changed |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 |
|
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
23 |
# interactive merge |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
24 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
25 |
local changed file1 which remote deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
26 |
use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
27 |
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 |
(branch merge, don't forget to commit) |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
29 |
status: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
30 |
file2: No such file or directory |
|
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
31 |
C file1 |
|
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 |
file1: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
33 |
1 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
34 |
changed |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
35 |
file2 does not exist |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
36 |
|
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
37 |
# interactive merge with bad input |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
38 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
39 |
local changed file1 which remote deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
40 |
use (c)hanged version or (d)elete? unrecognized response |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
41 |
local changed file1 which remote deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
42 |
use (c)hanged version or (d)elete? unrecognized response |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 |
local changed file1 which remote deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 |
use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
45 |
use (c)hanged version or leave (d)eleted? unrecognized response |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
46 |
remote changed file2 which local deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
47 |
use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
48 |
(branch merge, don't forget to commit) |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
49 |
status: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
50 |
M file2 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
51 |
R file1 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
52 |
file1 does not exist |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
53 |
file2: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
54 |
2 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
55 |
changed |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
56 |
|
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
57 |
# interactive merge with not enough input |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
58 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
59 |
local changed file1 which remote deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
60 |
use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
61 |
use (c)hanged version or leave (d)eleted? abort: response expected |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
62 |
failed |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
63 |
status: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
64 |
file2: No such file or directory |
|
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
65 |
C file1 |
|
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
66 |
file1: |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
67 |
1 |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
68 |
changed |
|
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
69 |
file2 does not exist |