annotate tests/test-up-local-change.t @ 45933:2960b7fac966

setup: copy pythonXY.dll next to the hg.exe wrapper when building This avoids the problem of having the newly built binary complaining that it can't find the DLL. There is an option in the python.org installer to add the python install to PATH (which defaulted to "on" with py2, and therefore was not an issue up to this point), but that makes switching between python versions harder. This shouldn't be an issue with the PyOxidizer binary, but that current has issues running some of the tests, and took noticeably longer to build last time I tried it. Differential Revision: https://phab.mercurial-scm.org/D9362
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 21 Nov 2020 16:20:49 -0500
parents c4f14db3da1d
children 69429972ff1f
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 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
44 branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
45 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
46 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
47 getting b
45488
c4f14db3da1d merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents: 44162
diff changeset
48 preserving a for resolve of a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
49 a: versions differ -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
50 picked tool 'true' for a (binary False symlink False changedelete False)
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
51 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
53 a: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
54 picked tool 'true' for a (binary False symlink False changedelete False)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
56 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
57 merge tool returned: 0
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
30200
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
67 starting 4 threads for background file closing (?)
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
68 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
69 branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
18541
5ed6a375e9ca merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
71 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
72 removing b
45488
c4f14db3da1d merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents: 44162
diff changeset
73 preserving a for resolve of a
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 28065
diff changeset
74 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
75 a: versions differ -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
76 picked tool 'true' for a (binary False symlink False changedelete False)
12120
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
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
79 a: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
80 picked tool 'true' for a (binary False symlink False changedelete False)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
81 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
82 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
83 merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
84 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
85 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
86 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
87 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
88 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
89 summary: 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
90
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
91 $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
92 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
93 branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
94 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
95 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
96 getting b
45488
c4f14db3da1d merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents: 44162
diff changeset
97 preserving a for resolve of a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
98 a: versions differ -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
99 picked tool 'true' for a (binary False symlink False changedelete False)
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
100 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
102 a: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
103 picked tool 'true' for a (binary False symlink False changedelete False)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
104 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
105 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
106 merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
107 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
108 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
109 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
110 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
111 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
112 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
113 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
114
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
115 $ hg -v history
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 files: a b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
121 description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
122 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
123
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
124
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
125 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
126 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
127 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
128 files: a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
129 description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
130 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
131
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
132
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
133 $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
134 diff -r 1e71731e6fbb a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
135 --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
136 +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
137 @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
138 -a2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
139 +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
140
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
141
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
142 create a second head
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
143
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
144 $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
145 $ hg up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
146 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
147 $ echo b2 > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
148 $ echo a3 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
149 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
150 adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
151 $ hg commit -m "3"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
152 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
153
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
154 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
155 $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
156 $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
157 M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
158 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
159 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
160 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
161 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
162 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
163
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
164 $ hg --debug up
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27161
diff changeset
165 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698
1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30229
diff changeset
166 updated to "1e71731e6fbb: 2"
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27161
diff changeset
167 1 other heads for branch "default"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
168
23477
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
169 test conflicting untracked files
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
170
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
171 $ hg up -qC 0
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
172 $ echo untracked > b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
173 $ hg st
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
174 ? b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
175 $ hg up 1
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
176 b: untracked file differs
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
177 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
178 [255]
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
179 $ rm b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
180
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
181 test conflicting untracked ignored file
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
182
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
183 $ hg up -qC 0
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
184 $ echo ignored > .hgignore
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
185 $ hg add .hgignore
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
186 $ hg ci -m 'add .hgignore'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
187 created new head
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
188 $ echo ignored > ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
189 $ hg add ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
190 $ hg ci -m 'add ignored file'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
191
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
192 $ hg up -q 'desc("add .hgignore")'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
193 $ echo untracked > ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
194 $ hg st
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
195 $ 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
196 ignored: untracked file differs
30b602168c3b update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents: 23477
diff changeset
197 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
198 [255]
23477
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
199
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
200 test a local add
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
201
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
202 $ cd ..
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
203 $ hg init a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
204 $ hg init b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
205 $ echo a > a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
206 $ echo a > b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
207 $ hg --cwd a commit -A -m a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
208 adding a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
209 $ cd b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
210 $ hg add a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
211 $ hg pull -u ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
212 pulling from ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
213 requesting all changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
214 adding changesets
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
215 adding manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
216 adding file changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
217 added 1 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
218 new changesets cb9a9f314b8b
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
219 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
220 $ hg st
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
221
30200
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
222 test updating backwards through a rename
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
223
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
224 $ hg mv a b
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
225 $ hg ci -m b
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
226 $ echo b > b
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
227 $ hg up -q 0
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
228 $ hg st
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
229 M a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
230 $ hg diff --nodates
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
231 diff -r cb9a9f314b8b a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
232 --- a/a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
233 +++ b/a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
234 @@ -1,1 +1,1 @@
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
235 -a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
236 +b
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
237
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
238 test for superfluous filemerge of clean files renamed in the past
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
239
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
240 $ hg up -qC tip
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
241 $ echo c > c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
242 $ hg add c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
243 $ hg up -qt:fail 0
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
244
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
245 $ cd ..