Mercurial > hg
annotate tests/test-hardlinks.t @ 24353:3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
Before this patch, "@99" suffixed bookmark may be updated unexpectedly
by the bookmark value on the remote side at "hg pull", if all of "@1"
to "@99" suffixed bookmarks exist in the local repository, because
variable "n" still refers "@99" suffixed bookmark after the loop to
examine "@num" suffixes, even though it already exists in the local
repository.
This patch prevents divergent bookmark from being updated
unexpectedly, and shows warning message in such situation.
This patch uses original python script "seq.py" instead of "seq"
command to create sequence numbers in the test, because "seq" command
may not be available: it isn't defined in recent POSIX specification
(POSIX.1-2001 2013 Edition or XPG7)
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 17 Mar 2015 18:20:24 +0900 |
parents | 07a92bbd02e5 |
children | 27ad6b91f5c2 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20185
diff
changeset
|
1 #require hardlink |
16971
8aeb2f1ae94c
tests: introduce hghave hardlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
16918
diff
changeset
|
2 |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
3 $ cat > nlinks.py <<EOF |
16918
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
4 > import sys |
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
5 > from mercurial import util |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
6 > for f in sorted(sys.stdin.readlines()): |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
7 > f = f[:-1] |
16918
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
8 > print util.nlinks(f), f |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
9 > EOF |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
10 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
11 $ nlinksdir() |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
12 > { |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
13 > find $1 -type f | python $TESTTMP/nlinks.py |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
14 > } |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
15 |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
16 Some implementations of cp can't create hardlinks (replaces 'cp -al' on Linux): |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
17 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
18 $ cat > linkcp.py <<EOF |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
19 > from mercurial import util |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
20 > import sys |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
21 > util.copyfiles(sys.argv[1], sys.argv[2], hardlink=True) |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
22 > EOF |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
23 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
24 $ linkcp() |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
25 > { |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
26 > python $TESTTMP/linkcp.py $1 $2 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
27 > } |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
28 |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
29 Prepare repo r1: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
30 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13272
diff
changeset
|
31 $ hg init r1 |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
32 $ cd r1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
33 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
34 $ echo c1 > f1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
35 $ hg add f1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
36 $ hg ci -m0 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
37 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
38 $ mkdir d1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
39 $ cd d1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
40 $ echo c2 > f2 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
41 $ hg add f2 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
42 $ hg ci -m1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
43 $ cd ../.. |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
44 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
45 $ nlinksdir r1/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
46 1 r1/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
47 1 r1/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
48 1 r1/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
49 1 r1/.hg/store/data/f1.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
50 1 r1/.hg/store/fncache |
15483
9ae766f2f452
phases: set new commit in 1-phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15455
diff
changeset
|
51 1 r1/.hg/store/phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
52 1 r1/.hg/store/undo |
23904
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
53 1 r1/.hg/store/undo.backup.fncache |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
54 1 r1/.hg/store/undo.backupfiles |
15455
c6f87bdab2a1
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15444
diff
changeset
|
55 1 r1/.hg/store/undo.phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
56 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
57 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
58 Create hardlinked clone r2: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
59 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
60 $ hg clone -U --debug r1 r2 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
61 linked 7 files |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
62 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
63 Create non-hardlinked clone r3: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
64 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
65 $ hg clone --pull r1 r3 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
66 requesting all changes |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
67 adding changesets |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
68 adding manifests |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
69 adding file changes |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
70 added 2 changesets with 2 changes to 2 files |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
71 updating to branch default |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
72 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
73 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
74 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
75 Repos r1 and r2 should now contain hardlinked files: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
76 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
77 $ nlinksdir r1/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
78 2 r1/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
79 2 r1/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
80 2 r1/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
81 2 r1/.hg/store/data/f1.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
82 2 r1/.hg/store/fncache |
15483
9ae766f2f452
phases: set new commit in 1-phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15455
diff
changeset
|
83 1 r1/.hg/store/phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
84 1 r1/.hg/store/undo |
23904
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
85 1 r1/.hg/store/undo.backup.fncache |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
86 1 r1/.hg/store/undo.backupfiles |
15455
c6f87bdab2a1
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15444
diff
changeset
|
87 1 r1/.hg/store/undo.phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
88 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
89 $ nlinksdir r2/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
90 2 r2/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
91 2 r2/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
92 2 r2/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
93 2 r2/.hg/store/data/f1.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
94 2 r2/.hg/store/fncache |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
95 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
96 Repo r3 should not be hardlinked: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
97 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
98 $ nlinksdir r3/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
99 1 r3/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
100 1 r3/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
101 1 r3/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
102 1 r3/.hg/store/data/f1.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
103 1 r3/.hg/store/fncache |
15659
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
104 1 r3/.hg/store/phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
105 1 r3/.hg/store/undo |
23904
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
106 1 r3/.hg/store/undo.backupfiles |
15455
c6f87bdab2a1
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15444
diff
changeset
|
107 1 r3/.hg/store/undo.phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
108 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
109 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
110 Create a non-inlined filelog in r3: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
111 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
112 $ cd r3/d1 |
16918
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
113 >>> f = open('data1', 'wb') |
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
114 >>> for x in range(10000): |
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
115 ... f.write("%s\n" % str(x)) |
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
116 >>> f.close() |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
117 $ for j in 0 1 2 3 4 5 6 7 8 9; do |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
118 > cat data1 >> f2 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
119 > hg commit -m$j |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
120 > done |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
121 $ cd ../.. |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
122 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
123 $ nlinksdir r3/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
124 1 r3/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
125 1 r3/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
126 1 r3/.hg/store/data/d1/f2.d |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
127 1 r3/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
128 1 r3/.hg/store/data/f1.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
129 1 r3/.hg/store/fncache |
15483
9ae766f2f452
phases: set new commit in 1-phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15455
diff
changeset
|
130 1 r3/.hg/store/phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
131 1 r3/.hg/store/undo |
23904
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
132 1 r3/.hg/store/undo.backup.fncache |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
133 1 r3/.hg/store/undo.backup.phaseroots |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
134 1 r3/.hg/store/undo.backupfiles |
15455
c6f87bdab2a1
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15444
diff
changeset
|
135 1 r3/.hg/store/undo.phaseroots |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
136 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
137 Push to repo r1 should break up most hardlinks in r2: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
138 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
139 $ hg -R r2 verify |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
140 checking changesets |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
141 checking manifests |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
142 crosschecking files in changesets and manifests |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
143 checking files |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
144 2 files, 2 changesets, 2 total revisions |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
145 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
146 $ cd r3 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
147 $ hg push |
16918
b112e265b78a
test-hardlinks: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
148 pushing to $TESTTMP/r1 (glob) |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
149 searching for changes |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
150 adding changesets |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
151 adding manifests |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
152 adding file changes |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
153 added 10 changesets with 10 changes to 1 files |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
154 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
155 $ cd .. |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
156 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
157 $ nlinksdir r2/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
158 1 r2/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
159 1 r2/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
160 1 r2/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
161 2 r2/.hg/store/data/f1.i |
24164
07a92bbd02e5
transaction: really disable hardlink backups (issue4546)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23904
diff
changeset
|
162 1 r2/.hg/store/fncache |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
163 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
164 $ hg -R r2 verify |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
165 checking changesets |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
166 checking manifests |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
167 crosschecking files in changesets and manifests |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
168 checking files |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
169 2 files, 2 changesets, 2 total revisions |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
170 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
171 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
172 $ cd r1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
173 $ hg up |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
174 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
175 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
176 Committing a change to f1 in r1 must break up hardlink f1.i in r2: |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
177 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
178 $ echo c1c1 >> f1 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
179 $ hg ci -m00 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
180 $ cd .. |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
181 |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
182 $ nlinksdir r2/.hg/store |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
183 1 r2/.hg/store/00changelog.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
184 1 r2/.hg/store/00manifest.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
185 1 r2/.hg/store/data/d1/f2.i |
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
186 1 r2/.hg/store/data/f1.i |
24164
07a92bbd02e5
transaction: really disable hardlink backups (issue4546)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23904
diff
changeset
|
187 1 r2/.hg/store/fncache |
12967
70b043405400
tests: add test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
188 |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
189 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
190 $ cd r3 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
191 $ hg tip --template '{rev}:{node|short}\n' |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
192 11:a6451b6bc41f |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
193 $ echo bla > f1 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
194 $ hg ci -m1 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
195 $ cd .. |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
196 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
197 Create hardlinked copy r4 of r3 (on Linux, we would call 'cp -al'): |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
198 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
199 $ linkcp r3 r4 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
200 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
201 r4 has hardlinks in the working dir (not just inside .hg): |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
202 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
203 $ nlinksdir r4 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
204 2 r4/.hg/00changelog.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
205 2 r4/.hg/branch |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
18382
diff
changeset
|
206 2 r4/.hg/cache/branch2-served |
23786
7d63398fbfd1
branchmap: use revbranchcache when updating branch map
Mads Kiilerich <madski@unity3d.com>
parents:
22648
diff
changeset
|
207 2 r4/.hg/cache/rbc-names-v1 |
7d63398fbfd1
branchmap: use revbranchcache when updating branch map
Mads Kiilerich <madski@unity3d.com>
parents:
22648
diff
changeset
|
208 2 r4/.hg/cache/rbc-revs-v1 |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
209 2 r4/.hg/dirstate |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
210 2 r4/.hg/hgrc |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
211 2 r4/.hg/last-message.txt |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
212 2 r4/.hg/requires |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
213 2 r4/.hg/store/00changelog.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
214 2 r4/.hg/store/00manifest.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
215 2 r4/.hg/store/data/d1/f2.d |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
216 2 r4/.hg/store/data/d1/f2.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
217 2 r4/.hg/store/data/f1.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
218 2 r4/.hg/store/fncache |
15483
9ae766f2f452
phases: set new commit in 1-phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15455
diff
changeset
|
219 2 r4/.hg/store/phaseroots |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
220 2 r4/.hg/store/undo |
23904
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
221 2 r4/.hg/store/undo.backup.fncache |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
222 2 r4/.hg/store/undo.backup.phaseroots |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
223 2 r4/.hg/store/undo.backupfiles |
15455
c6f87bdab2a1
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15444
diff
changeset
|
224 2 r4/.hg/store/undo.phaseroots |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13272
diff
changeset
|
225 2 r4/.hg/undo.bookmarks |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
226 2 r4/.hg/undo.branch |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
227 2 r4/.hg/undo.desc |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
228 2 r4/.hg/undo.dirstate |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
229 2 r4/d1/data1 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
230 2 r4/d1/f2 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
231 2 r4/f1 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
232 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
233 Update back to revision 11 in r4 should break hardlink of file f1: |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
234 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
235 $ hg -R r4 up 11 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
236 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
237 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
238 $ nlinksdir r4 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
239 2 r4/.hg/00changelog.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
240 1 r4/.hg/branch |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
18382
diff
changeset
|
241 2 r4/.hg/cache/branch2-served |
23786
7d63398fbfd1
branchmap: use revbranchcache when updating branch map
Mads Kiilerich <madski@unity3d.com>
parents:
22648
diff
changeset
|
242 2 r4/.hg/cache/rbc-names-v1 |
7d63398fbfd1
branchmap: use revbranchcache when updating branch map
Mads Kiilerich <madski@unity3d.com>
parents:
22648
diff
changeset
|
243 2 r4/.hg/cache/rbc-revs-v1 |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
244 1 r4/.hg/dirstate |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
245 2 r4/.hg/hgrc |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
246 2 r4/.hg/last-message.txt |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
247 2 r4/.hg/requires |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
248 2 r4/.hg/store/00changelog.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
249 2 r4/.hg/store/00manifest.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
250 2 r4/.hg/store/data/d1/f2.d |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
251 2 r4/.hg/store/data/d1/f2.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
252 2 r4/.hg/store/data/f1.i |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
253 2 r4/.hg/store/fncache |
15483
9ae766f2f452
phases: set new commit in 1-phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15455
diff
changeset
|
254 2 r4/.hg/store/phaseroots |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
255 2 r4/.hg/store/undo |
23904
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
256 2 r4/.hg/store/undo.backup.fncache |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
257 2 r4/.hg/store/undo.backup.phaseroots |
d251da5e0e84
transaction: include backup file in the "undo" transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23786
diff
changeset
|
258 2 r4/.hg/store/undo.backupfiles |
15455
c6f87bdab2a1
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15444
diff
changeset
|
259 2 r4/.hg/store/undo.phaseroots |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13272
diff
changeset
|
260 2 r4/.hg/undo.bookmarks |
13019
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
261 2 r4/.hg/undo.branch |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
262 2 r4/.hg/undo.desc |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
263 2 r4/.hg/undo.dirstate |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
264 2 r4/d1/data1 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
265 2 r4/d1/f2 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
266 1 r4/f1 |
42ac864ed394
test-hardlinks: add testcase for repo copied with 'cp -al'
Adrian Buehlmann <adrian@cadifra.com>
parents:
12967
diff
changeset
|
267 |
13034
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
268 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
269 Test hardlinking outside hg: |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
270 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
271 $ mkdir x |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
272 $ echo foo > x/a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
273 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
274 $ linkcp x y |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
275 $ echo bar >> y/a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
276 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
277 No diff if hardlink: |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
278 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
279 $ diff x/a y/a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
280 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
281 Test mq hardlinking: |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
282 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
283 $ echo "[extensions]" >> $HGRCPATH |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
284 $ echo "mq=" >> $HGRCPATH |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
285 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
286 $ hg init a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
287 $ cd a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
288 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
289 $ hg qimport -n foo - << EOF |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
290 > # HG changeset patch |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
291 > # Date 1 0 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
292 > diff -r 2588a8b53d66 a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
293 > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
294 > +++ b/a Wed Jul 23 15:54:29 2008 +0200 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
295 > @@ -0,0 +1,1 @@ |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
296 > +a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
297 > EOF |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
298 adding foo to series file |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
299 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
300 $ hg qpush |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
301 applying foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
302 now at: foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
303 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
304 $ cd .. |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
305 $ linkcp a b |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
306 $ cd b |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
307 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
308 $ hg qimport -n bar - << EOF |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
309 > # HG changeset patch |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
310 > # Date 2 0 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
311 > diff -r 2588a8b53d66 a |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
312 > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
313 > +++ b/b Wed Jul 23 15:54:29 2008 +0200 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
314 > @@ -0,0 +1,1 @@ |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
315 > +b |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
316 > EOF |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
317 adding bar to series file |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
318 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
319 $ hg qpush |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
320 applying bar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
321 now at: bar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
322 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
323 $ cat .hg/patches/status |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
324 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
325 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
326 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
327 $ cat .hg/patches/series |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
328 foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
329 bar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
330 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
331 $ cat ../a/.hg/patches/status |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
332 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
333 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
334 $ cat ../a/.hg/patches/series |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
335 foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
336 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
337 Test tags hardlinking: |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
338 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
339 $ hg qdel -r qbase:qtip |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
340 patch foo finalized without changeset message |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
341 patch bar finalized without changeset message |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
342 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
343 $ hg tag -l lfoo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
344 $ hg tag foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
345 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
346 $ cd .. |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
347 $ linkcp b c |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
348 $ cd c |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
349 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
350 $ hg tag -l -r 0 lbar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
351 $ hg tag -r 0 bar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
352 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
353 $ cat .hgtags |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
354 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
355 430ed4828a74fa4047bc816a25500f7472ab4bfe bar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
356 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
357 $ cat .hg/localtags |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
358 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
359 430ed4828a74fa4047bc816a25500f7472ab4bfe lbar |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
360 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
361 $ cat ../b/.hgtags |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
362 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
363 |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
364 $ cat ../b/.hg/localtags |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
365 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo |
8cb33163b391
tests: integrate test-hardlinks-safety.t into test-hardlinks.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
13019
diff
changeset
|
366 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15659
diff
changeset
|
367 $ cd .. |