Mercurial > hg
annotate tests/test-symlinks.t @ 48365:67064c238ae7
errors: use detailed exit code for non-integer number of diff context lines
Differential Revision: https://phab.mercurial-scm.org/D11826
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 19 Nov 2021 15:38:36 -0800 |
parents | d5a91701f7dc |
children | e845537f6adb |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
19157
diff
changeset
|
1 #require symlink |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
2 |
48068
bf8837e3d7ce
dirstate: Remove the flat Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
47281
diff
changeset
|
3 #testcases dirstate-v1 dirstate-v2 |
47129
93eb6c8035a9
dirstate-tree: Add a dirstate-v1-tree variant of some tests
Simon Sapin <simon.sapin@octobus.net>
parents:
45846
diff
changeset
|
4 |
47281
6763913fa175
dirstate-v2: Add a variant of some tests, that uses the new format
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
5 #if dirstate-v2 |
48235
5c567aca080d
dirstate-v2: add an option to prevent unintentional slow dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48223
diff
changeset
|
6 $ cat >> $HGRCPATH << EOF |
5c567aca080d
dirstate-v2: add an option to prevent unintentional slow dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48223
diff
changeset
|
7 > [format] |
48295
bf11ff22a9af
dirstate-v2: freeze the on-disk format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48235
diff
changeset
|
8 > exp-rc-dirstate-v2=1 |
48235
5c567aca080d
dirstate-v2: add an option to prevent unintentional slow dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48223
diff
changeset
|
9 > [storage] |
5c567aca080d
dirstate-v2: add an option to prevent unintentional slow dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48223
diff
changeset
|
10 > dirstate-v2.slow-path=allow |
5c567aca080d
dirstate-v2: add an option to prevent unintentional slow dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48223
diff
changeset
|
11 > EOF |
47281
6763913fa175
dirstate-v2: Add a variant of some tests, that uses the new format
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
12 #endif |
6763913fa175
dirstate-v2: Add a variant of some tests, that uses the new format
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
13 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
14 == tests added in 0.7 == |
1408 | 15 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
16 $ hg init test-symlinks-0.7; cd test-symlinks-0.7; |
23462
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
17 $ touch foo; ln -s foo bar; ln -s nonexistent baz |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
18 |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
19 import with add and addremove -- symlink walking should _not_ screwup. |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
20 |
23462
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
21 $ hg add |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
22 adding bar |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
23 adding baz |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
24 adding foo |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
25 $ hg forget bar baz foo |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
26 $ hg addremove |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
27 adding bar |
23462
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
28 adding baz |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
29 adding foo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
30 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
31 commit -- the symlink should _not_ appear added to dir state |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
32 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
33 $ hg commit -m 'initial' |
1408 | 34 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
35 $ touch bomb |
1408 | 36 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
37 again, symlink should _not_ show up on dir state |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
38 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
39 $ hg addremove |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
40 adding bomb |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
41 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
42 Assert screamed here before, should go by without consequence |
1408 | 43 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
44 $ hg commit -m 'is there a bug?' |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
45 $ cd .. |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
46 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
47 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
48 == fifo & ignore == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
49 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
50 $ hg init test; cd test; |
1408 | 51 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
52 $ mkdir dir |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
53 $ touch a.c dir/a.o dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
54 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
55 test what happens if we want to trick hg |
1408 | 56 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
57 $ hg commit -A -m 0 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
58 adding a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
59 adding dir/a.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
60 adding dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
61 $ echo "relglob:*.o" > .hgignore |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
62 $ rm a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
63 $ rm dir/a.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
64 $ rm dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
65 $ mkdir dir/a.o |
17492 | 66 $ ln -s nonexistent dir/b.o |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
67 $ mkfifo a.c |
1408 | 68 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
69 it should show a.c, dir/a.o and dir/b.o deleted |
1487
2bc6cd62a29c
fix handling of files of unsupported type in the walk code
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1408
diff
changeset
|
70 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
71 $ hg status |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
72 M dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
73 ! a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
74 ! dir/a.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
75 ? .hgignore |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
76 $ hg status a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
77 a.c: unsupported file type (type is fifo) |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
78 ! a.c |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
79 $ cd .. |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
80 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
81 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
82 == symlinks from outside the tree == |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
83 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
84 test absolute path through symlink outside repo |
1487
2bc6cd62a29c
fix handling of files of unsupported type in the walk code
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1408
diff
changeset
|
85 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
86 $ p=`pwd` |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
87 $ hg init x |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
88 $ ln -s x y |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
89 $ cd x |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
90 $ touch f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
91 $ hg add f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
92 $ hg status "$p"/y/f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
93 A f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
94 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
95 try symlink outside repo to file inside |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
96 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
97 $ ln -s x/f ../z |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
98 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
99 this should fail |
2115
fd77b7ee4aac
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
Jim Meyering <list+hg@meyering.net>
parents:
1620
diff
changeset
|
100 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
101 $ hg status ../z && { echo hg mistakenly exited with status 0; exit 1; } || : |
18450
4f9a52858512
scmutil: localize and improve 'not under root' message
Mads Kiilerich <madski@unity3d.com>
parents:
17492
diff
changeset
|
102 abort: ../z not under root '$TESTTMP/x' |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
103 $ cd .. |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
104 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
105 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
106 == cloning symlinks == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
107 $ hg init clone; cd clone; |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
108 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
109 try cloning symlink in a subdir |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
110 1. commit a symlink |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
111 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
112 $ mkdir -p a/b/c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
113 $ cd a/b/c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
114 $ ln -s /path/to/symlink/source demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
115 $ cd ../../.. |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
116 $ hg stat |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
117 ? a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
118 $ hg commit -A -m 'add symlink in a/b/c subdir' |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
119 adding a/b/c/demo |
2115
fd77b7ee4aac
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
Jim Meyering <list+hg@meyering.net>
parents:
1620
diff
changeset
|
120 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
121 2. clone it |
4137
26596a6b6518
Create the parent directory when checking out symlinks.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3988
diff
changeset
|
122 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
123 $ cd .. |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
124 $ hg clone clone clonedest |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
125 updating to branch default |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
126 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
127 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
128 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
129 == symlink and git diffs == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
130 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
131 git symlink diff |
4137
26596a6b6518
Create the parent directory when checking out symlinks.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3988
diff
changeset
|
132 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
133 $ cd clonedest |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
134 $ hg diff --git -r null:tip |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
135 diff --git a/a/b/c/demo b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
136 new file mode 120000 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
137 --- /dev/null |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
138 +++ b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
139 @@ -0,0 +1,1 @@ |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
140 +/path/to/symlink/source |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
141 \ No newline at end of file |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
142 $ hg export --git tip > ../sl.diff |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
143 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
144 import git symlink diff |
5116
35d47b06d4e3
patch: add git symlink support
Brendan Cully <brendan@kublai.com>
parents:
4882
diff
changeset
|
145 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
146 $ hg rm a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
147 $ hg commit -m'remove link' |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
148 $ hg import ../sl.diff |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
149 applying ../sl.diff |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
150 $ hg diff --git -r 1:tip |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
151 diff --git a/a/b/c/demo b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
152 new file mode 120000 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
153 --- /dev/null |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
154 +++ b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
155 @@ -0,0 +1,1 @@ |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
156 +/path/to/symlink/source |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
157 \ No newline at end of file |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
158 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
159 == symlinks and addremove == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
160 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
161 directory moved and symlinked |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
162 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
163 $ mkdir foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
164 $ touch foo/a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
165 $ hg ci -Ama |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
166 adding foo/a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
167 $ mv foo bar |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
168 $ ln -s bar foo |
18625
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
169 $ hg status |
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
170 ! foo/a |
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
171 ? bar/a |
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
172 ? foo |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
173 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
174 now addremove should remove old files |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
175 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
176 $ hg addremove |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
177 adding bar/a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
178 adding foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
179 removing foo/a |
19157
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
180 |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
181 commit and update back |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
182 |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
183 $ hg ci -mb |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
184 $ hg up '.^' |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
185 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
186 $ hg up tip |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
187 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
188 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
189 $ cd .. |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
190 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
191 == root of repository is symlinked == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
192 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
193 $ hg init root |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
194 $ ln -s root link |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
195 $ cd root |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
196 $ echo foo > foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
197 $ hg status |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
198 ? foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
199 $ hg status ../link |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
200 ? foo |
15797
c7a8164c61ab
canonpath: allow canonicalization of non-existant paths
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12399
diff
changeset
|
201 $ hg add foo |
c7a8164c61ab
canonpath: allow canonicalization of non-existant paths
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12399
diff
changeset
|
202 $ hg cp foo "$TESTTMP/link/bar" |
c7a8164c61ab
canonpath: allow canonicalization of non-existant paths
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12399
diff
changeset
|
203 foo has not been committed yet, so no copy data will be stored for bar. |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
204 $ cd .. |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
205 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
206 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
207 $ hg init b |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
208 $ cd b |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
209 $ ln -s nothing dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
210 $ hg commit -m 'commit symlink without adding' dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
211 abort: dangling: file not tracked! |
45846
96ca817ec192
errors: raise InputError when given non-existent paths etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
25472
diff
changeset
|
212 [10] |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
213 $ hg add dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
214 $ hg commit -m 'add symlink' |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
215 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
216 $ hg tip -v |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
217 changeset: 0:cabd88b706fc |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
218 tag: tip |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
219 user: test |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
220 date: Thu Jan 01 00:00:00 1970 +0000 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
221 files: dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
222 description: |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
223 add symlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
224 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
225 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
226 $ hg manifest --debug |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
227 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
228 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
229 dangling -> nothing |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
230 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
231 $ rm dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
232 $ ln -s void dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
233 $ hg commit -m 'change symlink' |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
234 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
235 dangling -> void |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
236 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
237 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
238 modifying link |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
239 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
240 $ rm dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
241 $ ln -s empty dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
242 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
243 dangling -> empty |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
244 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
245 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
246 reverting to rev 0: |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
247 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
248 $ hg revert -r 0 -a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
249 reverting dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
250 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
251 dangling -> nothing |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
252 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
253 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
254 backups: |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
255 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
256 $ readlink.py *.orig |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
257 dangling.orig -> empty |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
258 $ rm *.orig |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
259 $ hg up -C |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
260 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
261 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
262 copies |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
263 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
264 $ hg cp -v dangling dangling2 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
265 copying dangling to dangling2 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
266 $ hg st -Cmard |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
267 A dangling2 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
268 dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
269 $ readlink.py dangling dangling2 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
270 dangling -> void |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
271 dangling2 -> void |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
272 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
273 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12316
diff
changeset
|
274 Issue995: hg copy -A incorrectly handles symbolic links |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
275 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
276 $ hg up -C |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
277 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
278 $ mkdir dir |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
279 $ ln -s dir dirlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
280 $ hg ci -qAm 'add dirlink' |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
281 $ mkdir newdir |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
282 $ mv dir newdir/dir |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
283 $ mv dirlink newdir/dirlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
284 $ hg mv -A dirlink newdir/dirlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
285 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
286 $ cd .. |