Mercurial > hg
annotate tests/test-origbackup-conflict.t @ 47072:4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Since the dawn of time, people have been forced to rely to lossy introspection
of the index filename to determine what the purpose and role of the revlog they
encounter is. This is hacky, error prone, inflexible, abstraction-leaky,
<insert-your-own-complaints-here>.
In f63299ee7e4d Raphaël introduced a new attribute to track this information:
`revlog_kind`. However it is initialized in an odd place and various instances
end up not having it set. In addition is only tracking some of the information
we end up having to introspect in various pieces of code.
So we add a new attribute that holds more data and is more strictly enforced.
This work is done in collaboration with Raphaël.
The `revlog_kind` one will be removed/adapted in the next changeset. We expect
to be able to clean up various existing piece of code and to simplify coming
work around the newer revlog format.
Differential Revision: https://phab.mercurial-scm.org/D10352
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 06 Apr 2021 05:20:24 +0200 |
parents | d8e55c0c642c |
children |
rev | line source |
---|---|
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
1 Set up repo |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
2 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
3 $ cat << EOF >> $HGRCPATH |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
4 > [ui] |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
5 > origbackuppath=.hg/origbackups |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
6 > [merge] |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
7 > checkunknown=warn |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
8 > EOF |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
9 $ hg init repo |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
10 $ cd repo |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
11 $ echo base > base |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
12 $ hg add base |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
13 $ hg commit -m "base" |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
14 |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
15 Make a dir named b that contains a file, and a file named d |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
16 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
17 $ mkdir -p b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
18 $ echo c1 > b/c |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
19 $ echo d1 > d |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
20 $ hg add b/c d |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
21 $ hg commit -m "c1" |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
22 $ hg bookmark c1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
23 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
24 Peform an update that causes b/c to be backed up |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
25 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
26 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
27 $ mkdir -p b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
28 $ echo c2 > b/c |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
29 $ hg up --verbose c1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
30 resolving manifests |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
31 b/c: replacing untracked file |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
32 getting b/c |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
33 creating directory: $TESTTMP/repo/.hg/origbackups/b |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
34 getting d |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
35 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
36 (activating bookmark c1) |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
37 $ test -f .hg/origbackups/b/c |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
38 |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
39 Make files named b and d |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
40 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
41 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
42 $ echo b1 > b |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
43 $ echo d2 > d |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
44 $ hg add b d |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
45 $ hg commit -m b1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
46 created new head |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
47 $ hg bookmark b1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
48 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
49 Perform an update that causes b to be backed up - it should replace the backup b dir |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
50 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
51 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
52 $ echo b2 > b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
53 $ hg up --verbose b1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
54 resolving manifests |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
55 b: replacing untracked file |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
56 getting b |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
57 removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
58 getting d |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
60 (activating bookmark b1) |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
61 $ test -f .hg/origbackups/b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
62 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
63 Perform an update the causes b/c to be backed up again - it should replace the backup b file |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
64 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
65 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
66 $ mkdir b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
67 $ echo c3 > b/c |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
68 $ hg up --verbose c1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
69 resolving manifests |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
70 b/c: replacing untracked file |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
71 getting b/c |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
72 creating directory: $TESTTMP/repo/.hg/origbackups/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
73 removing conflicting file: $TESTTMP/repo/.hg/origbackups/b |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
74 getting d |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
75 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
76 (activating bookmark c1) |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
77 $ test -d .hg/origbackups/b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
78 |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
79 Cause two symlinks to be backed up that points to a valid location from the backup dir |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
80 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
81 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
82 $ mkdir ../sym-link-target |
34691
857fc3313f7b
test-conflicts: conditionalize for no-symlink platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
34570
diff
changeset
|
83 #if symlink |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
84 $ ln -s ../../../sym-link-target b |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
85 $ ln -s ../../../sym-link-target d |
34691
857fc3313f7b
test-conflicts: conditionalize for no-symlink platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
34570
diff
changeset
|
86 #else |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
87 $ touch b d |
34691
857fc3313f7b
test-conflicts: conditionalize for no-symlink platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
34570
diff
changeset
|
88 #endif |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
89 $ hg up b1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
90 b: replacing untracked file |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
91 d: replacing untracked file |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
93 (activating bookmark b1) |
34691
857fc3313f7b
test-conflicts: conditionalize for no-symlink platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
34570
diff
changeset
|
94 #if symlink |
34570
dbb2027f4974
tests: use readlink.py instead of readlink
Augie Fackler <augie@google.com>
parents:
34543
diff
changeset
|
95 $ readlink.py .hg/origbackups/b |
dbb2027f4974
tests: use readlink.py instead of readlink
Augie Fackler <augie@google.com>
parents:
34543
diff
changeset
|
96 .hg/origbackups/b -> ../../../sym-link-target |
34691
857fc3313f7b
test-conflicts: conditionalize for no-symlink platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
34570
diff
changeset
|
97 #endif |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
98 |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
99 Perform an update that causes b/c and d to be backed up again - b/c should not go into the target dir |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
100 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
101 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
102 $ mkdir b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
103 $ echo c4 > b/c |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
104 $ echo d3 > d |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
105 $ hg up --verbose c1 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
106 resolving manifests |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
107 b/c: replacing untracked file |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
108 d: replacing untracked file |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
109 getting b/c |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
110 creating directory: $TESTTMP/repo/.hg/origbackups/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
111 removing conflicting file: $TESTTMP/repo/.hg/origbackups/b |
35008
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
112 getting d |
ad671b4cb9fc
tests: add a test demonstrating issue5731
Mark Thomas <mbthomas@fb.com>
parents:
34692
diff
changeset
|
113 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
114 (activating bookmark c1) |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
115 $ cat .hg/origbackups/b/c |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
116 c4 |
35009
99ab7bc944d2
scmutil: don't try to delete origbackup symlinks to directories (issue5731)
Mark Thomas <mbthomas@fb.com>
parents:
35008
diff
changeset
|
117 $ cat .hg/origbackups/d |
99ab7bc944d2
scmutil: don't try to delete origbackup symlinks to directories (issue5731)
Mark Thomas <mbthomas@fb.com>
parents:
35008
diff
changeset
|
118 d3 |
34543
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
119 $ ls ../sym-link-target |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
120 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
121 Incorrectly configure origbackuppath to be under a file |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
122 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
123 $ echo data > .hg/badorigbackups |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
124 $ hg up -q 0 |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
125 $ mkdir b |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
126 $ echo c5 > b/c |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
127 $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
128 resolving manifests |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
129 b/c: replacing untracked file |
6fad8059a970
scmutil: handle conflicting files and dirs in origbackuppath
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
130 getting b/c |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35231
diff
changeset
|
131 creating directory: $TESTTMP/repo/.hg/badorigbackups/b |
42343
d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
40230
diff
changeset
|
132 removing conflicting file: $TESTTMP/repo/.hg/badorigbackups |
d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
40230
diff
changeset
|
133 getting d |
d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
40230
diff
changeset
|
134 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
40230
diff
changeset
|
135 (activating bookmark c1) |
d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
40230
diff
changeset
|
136 $ ls .hg/badorigbackups/b |
d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
40230
diff
changeset
|
137 c |