Mercurial > hg
annotate tests/test-up-local-change.t @ 49603:3eda36e9b3d6 stable
matcher: fix issues regex flag contained in pattern (issue6759)
Python 3.11 is now enforcing that flag must be at the beginning of the regex
This creates a serious regression for people using Python 3.11 with an hgignore
using flag in a "relre" pattern.
We now detect any flags in such pattern and "prepend" our ".*" pattern after them.
In addition, we now insert the flag in the regexp to only affect the pattern we
are rewriting. Otherwise, the regex built from the combined pattern would these
flags in the middle of it anyway.
As a side effect of this last change, we fix a bug… before this change regex
flag in a pattern would affect all combined patterns. That was bad and is not
longer the case.
The Rust code needs to be updated to fix that very bug, but we will do it in
another changeset.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Nov 2022 13:05:01 +0100 |
parents | 6b1049d71c3e |
children |
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 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 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46418
diff
changeset
|
49 a: versions differ -> m |
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 |
26611
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
25125
diff
changeset
|
53 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
|
54 merge tool returned: 0 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
55 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
|
56 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
57 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
58 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
59 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
60 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
|
61 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
62 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
63 $ 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
|
64 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
|
65 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
66 branchmerge: False, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
diff
changeset
|
67 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
68 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
|
69 removing b |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
70 starting 4 threads for background file closing (?) |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44162
diff
changeset
|
71 preserving a for resolve of a |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46418
diff
changeset
|
72 a: versions differ -> m |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
73 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
|
74 merging a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
75 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
26611
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
25125
diff
changeset
|
76 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
|
77 merge tool returned: 0 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
78 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
|
79 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
80 changeset: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
81 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
82 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
|
83 summary: 1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
84 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
85 $ hg --debug up |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
86 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
87 branchmerge: False, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15619
diff
changeset
|
88 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
21389
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
20641
diff
changeset
|
89 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
|
90 getting b |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44162
diff
changeset
|
91 preserving a for resolve of a |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46418
diff
changeset
|
92 a: versions differ -> m |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
93 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
|
94 merging a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
95 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
26611
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
25125
diff
changeset
|
96 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
|
97 merge tool returned: 0 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
98 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
|
99 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
100 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
101 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
102 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
103 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
|
104 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
105 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
106 $ hg -v history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
107 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
108 tag: tip |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
109 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
110 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
|
111 files: a b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
112 description: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
113 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 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
116 changeset: 0:c19d34741b0a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
117 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
118 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
|
119 files: a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
120 description: |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
121 1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
122 |
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 diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
125 diff -r 1e71731e6fbb a |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
126 --- a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
127 +++ b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
128 @@ -1,1 +1,1 @@ |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
129 -a2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
130 +abc |
331 | 131 |
12120
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 create a second head |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
134 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
135 $ cd ../r1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
136 $ hg up 0 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
137 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
|
138 $ echo b2 > b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
139 $ echo a3 > a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
140 $ hg addremove |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
141 adding b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
142 $ hg commit -m "3" |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
143 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
|
144 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
145 $ cd ../r2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
146 $ hg -q pull ../r1 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
147 $ hg status |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
148 M a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
149 $ hg parents |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
150 changeset: 1:1e71731e6fbb |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
151 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12120
diff
changeset
|
152 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
|
153 summary: 2 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
154 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
155 $ 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
|
156 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
|
157 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
|
158 1 other heads for branch "default" |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
159 |
23477
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
160 test conflicting untracked files |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
161 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
162 $ hg up -qC 0 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
163 $ echo untracked > b |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
164 $ hg st |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
165 ? b |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
166 $ hg up 1 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
167 b: untracked file differs |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
168 abort: untracked files in working directory differ from files in requested revision |
46418
dc00324e80f4
errors: use StateError more in merge module
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
169 [20] |
23477
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
170 $ rm b |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
171 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
172 test conflicting untracked ignored file |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
173 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
174 $ hg up -qC 0 |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
175 $ echo ignored > .hgignore |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
176 $ hg add .hgignore |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
177 $ hg ci -m 'add .hgignore' |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
178 created new head |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
179 $ echo ignored > ignored |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
180 $ hg add ignored |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
181 $ hg ci -m 'add 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 -q 'desc("add .hgignore")' |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
184 $ echo untracked > ignored |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
185 $ hg st |
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
186 $ 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
|
187 ignored: untracked file differs |
30b602168c3b
update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents:
23477
diff
changeset
|
188 abort: untracked files in working directory differ from files in requested revision |
46418
dc00324e80f4
errors: use StateError more in merge module
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
189 [20] |
23477
689540e6007e
update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents:
21391
diff
changeset
|
190 |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
191 test a local add |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
192 |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
193 $ cd .. |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
194 $ hg init a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
195 $ hg init b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
196 $ echo a > a/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
197 $ echo a > b/a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
198 $ hg --cwd a commit -A -m a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
199 adding a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
200 $ cd b |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
201 $ hg add a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
202 $ hg pull -u ../a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
203 pulling from ../a |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
204 requesting all changes |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
205 adding changesets |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
206 adding manifests |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
207 adding file changes |
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
208 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
|
209 new changesets cb9a9f314b8b |
12120
aeef24027906
tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4659
diff
changeset
|
210 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
|
211 $ hg st |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
212 |
30200
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
213 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
|
214 |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
215 $ 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
|
216 $ 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
|
217 $ 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
|
218 $ 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
|
219 $ hg st |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
220 M a |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
221 $ 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
|
222 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
|
223 --- a/a |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
224 +++ b/a |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
225 @@ -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
|
226 -a |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
227 +b |
a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29350
diff
changeset
|
228 |
30229
69ffbbe73dd0
merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
30200
diff
changeset
|
229 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
|
230 |
69ffbbe73dd0
merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
30200
diff
changeset
|
231 $ 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
|
232 $ echo c > c |
69ffbbe73dd0
merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
30200
diff
changeset
|
233 $ hg add c |
69ffbbe73dd0
merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
30200
diff
changeset
|
234 $ 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
|
235 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
236 $ cd .. |