annotate tests/test-up-local-change.t @ 14327:d943412e2fba

extdiff: grammar "allows to" -> "allows one to" The verb to allow requires a direct object. Lintian, a Debian tool to find common mistakes, reported it. I'm not a native english speaker but I think this is correct.
author Javi Merino <cibervicho@gmail.com>
date Sun, 15 May 2011 18:00:22 +0100
parents ffb5c09ba822
children 6c8573dd1b6b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
1 $ HGMERGE=true; export HGMERGE
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3199
diff changeset
2
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12681
diff changeset
3 $ hg init r1
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
4 $ cd r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
5 $ echo a > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
6 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
7 adding a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
8 $ hg commit -m "1"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
10 $ hg clone . ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
11 updating to branch default
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
13 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
14 $ hg up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
15 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
16 $ echo abc > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
17 $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
18 diff -r c19d34741b0a a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
19 --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
20 +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
21 @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
22 -a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
23 +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
25 $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
26 $ echo b > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
27 $ echo a2 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
28 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
29 adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
30 $ hg commit -m "2"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
31
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
32 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
33 $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
34 $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
35 M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
36 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
37 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
38 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
39 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
40 summary: 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
41
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
42 $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
43 searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
44 unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
45 b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
46 resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
47 overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
48 ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
49 a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
50 b: remote created -> g
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
51 preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
52 updating: a 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
53 picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
54 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
56 updating: b 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
57 getting b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
59 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
60 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
61 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
62 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
63 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
64 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
65
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
66 $ hg --debug up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
67 resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
68 overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
69 ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
70 a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
71 b: other deleted -> r
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
72 preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
73 updating: b 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
74 removing b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
75 updating: a 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
76 picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
77 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
79 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
80 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
81 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
82 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
83 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
84 summary: 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
85
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
86 $ hg --debug merge
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
87 abort: there is nothing to merge - use "hg update" instead
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
88 [255]
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
89 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
90 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
91 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
92 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
93 summary: 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
94
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
95 $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
96 searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
97 unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
98 b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
99 resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
100 overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
101 ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
102 a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
103 b: remote created -> g
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
104 preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
105 updating: a 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
106 picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
107 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
108 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
109 updating: b 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
110 getting b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
111 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
112 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
113 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
114 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
115 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
116 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
117 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
118
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
119 $ hg -v history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
120 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
121 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
122 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
123 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
124 files: a b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
125 description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
126 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
127
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
128
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
129 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
130 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
131 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
132 files: a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
133 description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
134 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
135
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
136
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
137 $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
138 diff -r 1e71731e6fbb a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
139 --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
140 +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
141 @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
142 -a2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
143 +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
144
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
145
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
146 create a second head
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
147
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
148 $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
149 $ hg up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
150 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
151 $ echo b2 > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
152 $ echo a3 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
153 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
154 adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
155 $ hg commit -m "3"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
156 created new head
1674
dee55c4a4963 abort when using 'update -m' and this is not a merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1581
diff changeset
157
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
158 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
159 $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
160 $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
161 M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
162 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
163 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
164 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
165 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
166 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
167
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
168 $ hg --debug up
12681
bc13e17067d9 update: use higher level wording for "crosses branches" error
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
169 abort: crosses branches (merge branches or use --clean to discard changes)
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
170 [255]
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
171 $ hg --debug merge
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
172 abort: outstanding uncommitted changes (use 'hg status' to list changes)
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
173 [255]
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
174 $ hg --debug merge -f
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
175 searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
176 resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
177 overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
178 ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
179 a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
180 b: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
181 preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
182 preserving b for resolve of b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
183 updating: a 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
184 picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
185 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
186 my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
187 updating: b 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
188 picked tool 'true' for b (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
189 merging b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
190 my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
191 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
192 (branch merge, don't forget to commit)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
193 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
194 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
195 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
196 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
197 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
198
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
199 changeset: 2:83c51d0caff4
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
200 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
201 parent: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
202 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
203 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
204 summary: 3
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
205
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
206 $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
207 diff -r 1e71731e6fbb a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
208 --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
209 +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
210 @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
211 -a2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
212 +abc
2065
2ff37e3bf780 fix update when a locally added file match the target revision
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1933
diff changeset
213
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
214
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
215 test a local add
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
216
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
217 $ cd ..
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
218 $ hg init a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
219 $ hg init b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
220 $ echo a > a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
221 $ echo a > b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
222 $ hg --cwd a commit -A -m a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
223 adding a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
224 $ cd b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
225 $ hg add a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
226 $ hg pull -u ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
227 pulling from ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
228 requesting all changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
229 adding changesets
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
230 adding manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
231 adding file changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
232 added 1 changesets with 1 changes to 1 files
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
234 $ hg st