Mercurial > hg

annotate tests/test-convert-svn-tags.out @ 11769:ca6cebd8734e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: ignore symlinks when fs cannot handle them (issue1888) When the filesystem cannot handle the executable bit, we currently ignore it completely when looking for modified files. Similarly, it is impossible to set or clear the bit when the filesystem ignores it. This patch makes Mercurial treat symbolic links the same way. Symlinks are a little different since they manifest themselves as small files containing a filename (the symlink target). On Windows, these files show up as regular files, and on Linux and Mac they show up as real symlinks. Issue1888 presents a case where the symlink files are better ignored from the Windows side. A Linux client creates symlinks in a working copy which is shared over a network between Linux and Windows clients. The Samba server is helpful and defererences the symlink when the Windows client looks at it. This means that Mercurial on the Windows side sees file content instead of a file name in the symlink, and hence flags the link as modified. Ignoring the change would be much more helpful, similarly to how Mercurial does not report any changes when executable bits are ignored in a checkout on Windows. An initial checkout of a symbolic link on a file system that cannot handle symbolic links will still result in a regular file containing the target file name as its content. Sharing such a checkout with a Linux client will not turn the file into a symlink automatically, but 'hg revert' can fix that. After the revert, the Windows client will see the correct file content (provided by the Samba server when it follows the link on the Linux side) and otherwise ignore the change. Running 'hg perfstatus' 10 times gives these results: Before: After: min: 0.544703 min: 0.546549 med: 0.547592 med: 0.548881 avg: 0.549146 avg: 0.548549 max: 0.564112 max: 0.551504 The median time is increased about 0.24%.
author Martin Geisler <mg@aragost.com>
date Mon, 09 Aug 2010 15:31:56 +0200
parents 965b11c1bd82
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 % convert
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2 initializing destination A-hg repository
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 scanning source...
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 sorting...
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5 converting...
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
6 5 init projA
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
7 4 adda
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
8 3 changea
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
9 2 changea2
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
10 1 changea3
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
11 0 changea
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
12 updating tags
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
13 o 6 update tags tags: tip
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
14 |
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
15 o 5 changea tags: trunk.goodtag
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
16 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
17 o 4 changea3 tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
18 |
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
19 o 3 changea2 tags: trunk.v1
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
20 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
21 o 2 changea tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
22 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
23 o 1 adda tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
24 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
25 o 0 init projA tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
26
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
27 tip 6:
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
28 trunk.goodtag 5:
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
29 trunk.v1 3:
6400
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
30 % convert without tags
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
31 initializing destination A-notags-hg repository
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
32 scanning source...
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
33 sorting...
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
34 converting...
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
35 5 init projA
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
36 4 adda
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
37 3 changea
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
38 2 changea2
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
39 1 changea3
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
40 0 changea
6400
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
41 tip