Mercurial > hg
annotate tests/test-up-local-change.t @ 25305:884ef09cf658 stable
convert: properly pass null ids through .hgtags (issue4678)
Mercurial uses tags of null to mark deletions, but convert was
silently discarding these because it had no mapping for them. Thus, it
was resurrecting deleted tags.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 27 May 2015 14:28:29 -0500 |
parents | eea3977e6fca |
children | bd625cd4e5e7 |
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 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
49 preserving a for resolve of a |
21389
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
20641
diff
changeset
|
50 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
|
51 getting b |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
52 updating: b 1/2 files (50.00%) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
53 a: versions differ -> m |
18631
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 |
24885
eea3977e6fca
windows: make shellquote() quote any path containing '\' (issue4629)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24727
diff
changeset
|
58 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
24727
5668202cfaaf
merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents:
23479
diff
changeset
|
59 merge tool returned: 0 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
60 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
|
61 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
62 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
63 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
64 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
65 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
|
66 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
67 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
68 $ hg --debug up 0 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
69 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
70 branchmerge: False, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
diff
changeset
|
71 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
72 preserving a for resolve of a |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
73 b: other deleted -> r |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
74 removing b |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
75 updating: b 1/2 files (50.00%) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
76 a: versions differ -> m |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
77 updating: a 2/2 files (100.00%) |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
78 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
|
79 merging a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
80 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
24885
eea3977e6fca
windows: make shellquote() quote any path containing '\' (issue4629)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24727
diff
changeset
|
81 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
24727
5668202cfaaf
merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents:
23479
diff
changeset
|
82 merge tool returned: 0 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
83 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
|
84 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
85 changeset: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
86 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
87 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
|
88 summary: 1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
89 |
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 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
103 preserving a for resolve of a |
21389
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
20641
diff
changeset
|
104 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
|
105 getting b |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
106 updating: b 1/2 files (50.00%) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
107 a: versions differ -> m |
18631
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 |
24885
eea3977e6fca
windows: make shellquote() quote any path containing '\' (issue4629)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24727
diff
changeset
|
112 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
24727
5668202cfaaf
merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents:
23479
diff
changeset
|
113 merge tool returned: 0 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
114 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
|
115 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
116 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
117 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
118 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
119 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
|
120 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
121 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
122 $ hg -v history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
123 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
124 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
125 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
126 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
|
127 files: a b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
128 description: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
129 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
130 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
131 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
132 changeset: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
133 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
134 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
|
135 files: a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
136 description: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
137 1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
138 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
139 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
140 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
141 diff -r 1e71731e6fbb a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
142 --- a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
143 +++ b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
144 @@ -1,1 +1,1 @@ |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
145 -a2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
146 +abc |
331 | 147 |
12120
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 create a second head |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
150 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
151 $ cd ../r1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
152 $ hg up 0 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
153 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
|
154 $ echo b2 > b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
155 $ echo a3 > a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
156 $ hg addremove |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
157 adding b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
158 $ hg commit -m "3" |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
159 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
|
160 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
161 $ cd ../r2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
162 $ hg -q pull ../r1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
163 $ hg status |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
164 M a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
165 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
166 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
167 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
168 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
|
169 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
170 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
171 $ 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
|
172 abort: uncommitted changes |
4894e0d9462d
update: improve error message for dirty non-linear update with rev
Siddharth Agarwal <sid0@fb.com>
parents:
18631
diff
changeset
|
173 (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
|
174 [255] |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
175 |
23477
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
176 test conflicting untracked files |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
177 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
178 $ hg up -qC 0 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
179 $ echo untracked > b |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
180 $ hg st |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
181 ? b |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
182 $ hg up 1 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
183 b: untracked file differs |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
184 abort: untracked files in working directory differ from files in requested revision |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
185 [255] |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
186 $ rm b |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
187 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
188 test conflicting untracked ignored file |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
189 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
190 $ hg up -qC 0 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
191 $ echo ignored > .hgignore |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
192 $ hg add .hgignore |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
193 $ hg ci -m 'add .hgignore' |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
194 created new head |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
195 $ echo ignored > ignored |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
196 $ hg add ignored |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
197 $ hg ci -m 'add ignored file' |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
198 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
199 $ hg up -q 'desc("add .hgignore")' |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
200 $ echo untracked > ignored |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
201 $ hg st |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
202 $ hg up 'desc("add ignored file")' |
23478
30b602168c3b
update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents:
23477
diff
changeset
|
203 ignored: untracked file differs |
30b602168c3b
update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents:
23477
diff
changeset
|
204 abort: untracked files in working directory differ from files in requested revision |
30b602168c3b
update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents:
23477
diff
changeset
|
205 [255] |
23477
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
206 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
207 test a local add |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
208 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
209 $ cd .. |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
210 $ hg init a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
211 $ hg init b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
212 $ echo a > a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
213 $ echo a > b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
214 $ hg --cwd a commit -A -m a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
215 adding a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
216 $ cd b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
217 $ hg add a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
218 $ hg pull -u ../a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
219 pulling from ../a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
220 requesting all changes |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
221 adding changesets |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
222 adding manifests |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
223 adding file changes |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
224 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
|
225 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
|
226 $ hg st |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
227 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
228 $ cd .. |