Mercurial > hg
annotate tests/test-up-local-change.t @ 21758:c27a37678508 stable
p4: accept changesets with no description (issue4282)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Jun 2014 12:04:48 -0500 |
parents | 3db9e798e004 |
children | e741972017d9 |
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 | 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 | 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 | 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 |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
47 branchmerge: False, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
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 |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
50 preserving a for resolve of a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
51 b: remote created -> g |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
52 getting b |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
53 updating: b 1/2 files (50.00%) |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
54 updating: a 2/2 files (100.00%) |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
55 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
|
56 merging a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
57 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
|
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 |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
68 branchmerge: False, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
diff
changeset
|
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
70 b: other deleted -> r |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
71 a: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
72 preserving a for resolve of a |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
73 removing b |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
74 updating: b 1/2 files (50.00%) |
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 |
15619
6c8573dd1b6b
merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents:
13956
diff
changeset
|
87 abort: nothing to merge |
6c8573dd1b6b
merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents:
13956
diff
changeset
|
88 (use 'hg update' instead) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
89 [255] |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
90 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
91 changeset: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
92 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
93 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
|
94 summary: 1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
95 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
96 $ hg --debug up |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
97 searching for copies back to rev 1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
98 unmatched files in other: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
99 b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
100 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
101 branchmerge: False, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
diff
changeset
|
102 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
103 a: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
104 preserving a for resolve of a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
105 b: remote created -> g |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
106 getting b |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
107 updating: b 1/2 files (50.00%) |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
108 updating: a 2/2 files (100.00%) |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
109 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
|
110 merging a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
111 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
|
112 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
|
113 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
114 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
115 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
116 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
117 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
|
118 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
119 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
120 $ hg -v history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
121 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
122 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
123 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
124 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
|
125 files: a b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
126 description: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
127 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
128 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
129 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
130 changeset: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
131 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
132 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
|
133 files: a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
134 description: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
135 1 |
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 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
138 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
139 diff -r 1e71731e6fbb a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
140 --- a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
141 +++ b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
142 @@ -1,1 +1,1 @@ |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
143 -a2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
144 +abc |
331 | 145 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
146 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
147 create a second head |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
148 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
149 $ cd ../r1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
150 $ hg up 0 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
151 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
|
152 $ echo b2 > b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
153 $ echo a3 > a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
154 $ hg addremove |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
155 adding b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
156 $ hg commit -m "3" |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
157 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
|
158 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
159 $ cd ../r2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
160 $ hg -q pull ../r1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
161 $ hg status |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
162 M a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
163 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
164 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
165 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
166 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
|
167 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
168 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
169 $ hg --debug up |
19800
4894e0d9462d
update: improve error message for dirty non-linear update with rev
Siddharth Agarwal <sid0@fb.com>
parents:
18631
diff
changeset
|
170 abort: uncommitted changes |
4894e0d9462d
update: improve error message for dirty non-linear update with rev
Siddharth Agarwal <sid0@fb.com>
parents:
18631
diff
changeset
|
171 (commit and merge, or update --clean to discard changes) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
172 [255] |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
173 $ hg --debug merge |
19802
94c394653b2a
merge: standardize error message for dirty working dir
Siddharth Agarwal <sid0@fb.com>
parents:
19800
diff
changeset
|
174 abort: uncommitted changes |
15619
6c8573dd1b6b
merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents:
13956
diff
changeset
|
175 (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
|
176 [255] |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
177 $ hg --debug merge -f |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
178 searching for copies back to rev 1 |
20641
3db9e798e004
copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents:
19802
diff
changeset
|
179 unmatched files new in both: |
3db9e798e004
copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents:
19802
diff
changeset
|
180 b |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
181 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
182 branchmerge: True, force: True, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
diff
changeset
|
183 ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
184 a: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
185 preserving a for resolve of a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
186 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
187 preserving b for resolve of b |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
188 updating: a 1/2 files (50.00%) |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
189 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
|
190 merging a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
191 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
|
192 updating: b 2/2 files (100.00%) |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
193 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
|
194 merging b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
195 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
|
196 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
|
197 (branch merge, don't forget to commit) |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
198 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
199 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
200 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
201 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
|
202 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
203 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
204 changeset: 2:83c51d0caff4 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
205 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
206 parent: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
207 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
208 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
|
209 summary: 3 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
210 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
211 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
212 diff -r 1e71731e6fbb a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
213 --- a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
214 +++ b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
215 @@ -1,1 +1,1 @@ |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
216 -a2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
217 +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
|
218 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
219 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
220 test a local add |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
221 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
222 $ cd .. |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
223 $ hg init a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
224 $ hg init b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
225 $ echo a > a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
226 $ echo a > b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
227 $ hg --cwd a commit -A -m a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
228 adding a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
229 $ cd b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
230 $ hg add a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
231 $ hg pull -u ../a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
232 pulling from ../a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
233 requesting all changes |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
234 adding changesets |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
235 adding manifests |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
236 adding file changes |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
237 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
|
238 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
|
239 $ hg st |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
240 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
241 $ cd .. |