annotate tests/test-up-local-change.t @ 40413:1ddd202c47d9

help: allow hiding of help topics Differential Revision: https://phab.mercurial-scm.org/D5077
author rdamazio@google.com
date Sat, 13 Oct 2018 05:43:39 -0700
parents eb586ed5d8ce
children 91a0bc50b288
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
1 $ HGMERGE=true; export HGMERGE
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3199
diff changeset
2
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12681
diff changeset
3 $ hg init r1
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
4 $ cd r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
5 $ echo a > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
6 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
7 adding a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
8 $ hg commit -m "1"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
10 $ hg clone . ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
11 updating to branch default
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
13 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
14 $ hg up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
15 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
16 $ echo abc > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
17 $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
18 diff -r c19d34741b0a a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
19 --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
20 +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
21 @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
22 -a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
23 +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
25 $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
26 $ echo b > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
27 $ echo a2 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
28 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
29 adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
30 $ hg commit -m "2"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
31
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
32 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
33 $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
34 $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
35 M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
36 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
37 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
38 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
39 date: Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
40 summary: 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
41
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
42 $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
43 searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
44 unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
45 b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
46 resolving manifests
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
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
52 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
53 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
54 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
56 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
57 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
58 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
59 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
60 merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
61 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
62 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
63 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
64 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
65 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
66 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
67 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
68
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
69 $ 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
70 starting 4 threads for background file closing (?)
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
71 searching for copies back to rev 0
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
72 unmatched files in local (from topological common ancestor):
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
73 b
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
74 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
75 branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
76 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
77 preserving a for resolve of a
18541
5ed6a375e9ca merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
78 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
79 removing b
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 28065
diff changeset
80 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
81 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
82 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
83 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
84 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
85 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
86 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
87 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
88 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
89 merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
90 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
91 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
92 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
93 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
94 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
95 summary: 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
96
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
97 $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
98 searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
99 unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
100 b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
101 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
102 branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
103 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
104 preserving a for resolve of a
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
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
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
107 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
108 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
109 merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
110 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
111 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
112 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
113 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
114 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
115 merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
116 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
117 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
118 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
119 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
120 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
121 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
122 summary: 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 $ hg -v history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
125 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
126 tag: tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
127 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
128 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
129 files: a b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
130 description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
131 2
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
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
134 changeset: 0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
135 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
136 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
137 files: a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
138 description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
139 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
140
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 $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
143 diff -r 1e71731e6fbb a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
144 --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
145 +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
146 @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
147 -a2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
148 +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
149
12120
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 create a second head
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
152
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
153 $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
154 $ hg up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
155 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
156 $ echo b2 > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
157 $ echo a3 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
158 $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
159 adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
160 $ hg commit -m "3"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
161 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
162
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
163 $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
164 $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
165 $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
166 M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
167 $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
168 changeset: 1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
169 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
170 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
171 summary: 2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
172
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
173 $ 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
174 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
175 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
176 1 other heads for branch "default"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
177
23477
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
178 test conflicting untracked files
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
179
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
180 $ hg up -qC 0
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
181 $ echo untracked > b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
182 $ hg st
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
183 ? b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
184 $ hg up 1
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
185 b: untracked file differs
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
186 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
187 [255]
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
188 $ rm b
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 test conflicting untracked 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 -qC 0
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
193 $ echo ignored > .hgignore
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
194 $ hg add .hgignore
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
195 $ hg ci -m 'add .hgignore'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
196 created new head
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
197 $ echo ignored > ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
198 $ hg add ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
199 $ hg ci -m 'add ignored file'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
200
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
201 $ hg up -q 'desc("add .hgignore")'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
202 $ echo untracked > ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
203 $ hg st
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
204 $ 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
205 ignored: untracked file differs
30b602168c3b update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents: 23477
diff changeset
206 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
207 [255]
23477
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
208
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
209 test a local add
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 $ cd ..
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
212 $ hg init a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
213 $ hg init b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
214 $ echo a > a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
215 $ echo a > b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
216 $ hg --cwd a commit -A -m a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
217 adding a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
218 $ cd b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
219 $ hg add a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
220 $ hg pull -u ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
221 pulling from ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
222 requesting all changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
223 adding changesets
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
224 adding manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
225 adding file changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
226 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
227 new changesets cb9a9f314b8b
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
228 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
229 $ hg st
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
230
30200
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
231 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
232
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
233 $ 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
234 $ 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
235 $ 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
236 $ 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
237 $ hg st
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
238 M a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
239 $ 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
240 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
241 --- a/a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
242 +++ b/a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
243 @@ -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
244 -a
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
245 +b
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29350
diff changeset
246
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
247 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
248
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
249 $ 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
250 $ echo c > c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
251 $ hg add c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
252 $ 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
253
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
254 $ cd ..