annotate tests/test-mq-qdelete.out @ 11769:ca6cebd8734e stable

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 561ff8d9e4f0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 adding base
4737
2ececafa5859 mq: more qdelete help text tweaks
Brendan Cully <brendan@kublai.com>
parents: 4736
diff changeset
2 abort: qdelete requires at least one revision or patch name
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
3 abort: cannot delete applied patch c
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 8833
diff changeset
4 popping c
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 6645
diff changeset
5 now at: b
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 a
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 b
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8 a
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 b
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 series
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11 status
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 8833
diff changeset
12 popping b
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 6645
diff changeset
13 now at: a
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 a
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
15 b
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
16 series
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
17 status
8833
14639c050251 mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8832
diff changeset
18 patch a finalized without changeset message
4722
487943b52a6c mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents: 3376
diff changeset
19 1 [mq]: a
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
20 0 base
3376
b9a7c07fca0e Update test-mq-qdelete to use qdel -r
Brendan Cully <brendan@kublai.com>
parents: 3088
diff changeset
21 abort: cannot delete revision 3 above applied patches
8833
14639c050251 mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8832
diff changeset
22 patch d finalized without changeset message
14639c050251 mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8832
diff changeset
23 patch e finalized without changeset message
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
24 f
4722
487943b52a6c mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents: 3376
diff changeset
25 4 [mq]: f
487943b52a6c mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents: 3376
diff changeset
26 3 [mq]: e
487943b52a6c mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents: 3376
diff changeset
27 2 [mq]: d
487943b52a6c mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents: 3376
diff changeset
28 1 [mq]: a
3088
dc784839516d mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
29 0 base
6645
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
30 adding base
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
31 abort: no revisions specified
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
32 no patches applied
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
33 abort: revision 0 is not managed
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
34 abort: cannot delete revision 2 above applied patches
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 8833
diff changeset
35 popping c
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 6645
diff changeset
36 now at: b
6645
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
37 abort: unknown revision 'c'!
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
38 applying c
7782
140429276b63 mq: handle empty patches more gracefully (issue1501)
Matt Mackall <mpm@selenic.com>
parents: 7627
diff changeset
39 patch c is empty
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 6645
diff changeset
40 now at: c
8832
6e6f5b80e056 mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7782
diff changeset
41 patch a finalized without changeset message
6e6f5b80e056 mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7782
diff changeset
42 patch b finalized without changeset message
6645
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
43 c
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
44 3 imported patch c
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
45 2 [mq]: b
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
46 1 [mq]: a
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
47 0 base
8832
6e6f5b80e056 mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7782
diff changeset
48 patch c finalized without changeset message
6645
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
49 3 imported patch c
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
50 2 [mq]: b
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
51 1 [mq]: a
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
52 0 base
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
53 series
37eedb1a1848 mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4737
diff changeset
54 status