equal
deleted
inserted
replaced
1 #require symlink |
|
2 |
|
3 Path conflict checking is currently disabled by default because of issue5716. |
1 Path conflict checking is currently disabled by default because of issue5716. |
4 Turn it on for this test. |
2 Turn it on for this test. |
5 |
3 |
6 $ cat >> $HGRCPATH << EOF |
4 $ cat >> $HGRCPATH << EOF |
7 > [experimental] |
5 > [experimental] |
22 $ echo 2 > a/b |
20 $ echo 2 > a/b |
23 $ hg commit -m "file2" |
21 $ hg commit -m "file2" |
24 $ hg bookmark -i file2 |
22 $ hg bookmark -i file2 |
25 $ hg up 0 |
23 $ hg up 0 |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
25 |
|
26 #if symlink |
27 $ mkdir a |
27 $ mkdir a |
28 $ ln -s c a/b |
28 $ ln -s c a/b |
29 $ hg add a/b |
29 $ hg add a/b |
30 $ hg commit -m "link" |
30 $ hg commit -m "link" |
31 created new head |
31 created new head |
|
32 #else |
|
33 $ hg import -q --bypass - <<EOF |
|
34 > # HG changeset patch |
|
35 > link |
|
36 > |
|
37 > diff --git a/a/b b/a/b |
|
38 > new file mode 120000 |
|
39 > --- /dev/null |
|
40 > +++ b/a/b |
|
41 > @@ -0,0 +1,1 @@ |
|
42 > +c |
|
43 > \ No newline at end of file |
|
44 > EOF |
|
45 $ hg up -q |
|
46 #endif |
|
47 |
32 $ hg bookmark -i link |
48 $ hg bookmark -i link |
33 $ hg up 0 |
49 $ hg up 0 |
34 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
50 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35 $ mkdir -p a/b/c |
51 $ mkdir -p a/b/c |
36 $ echo 2 > a/b/c/d |
52 $ echo 2 > a/b/c/d |
129 resolve manually then use 'hg resolve --mark a/b' |
145 resolve manually then use 'hg resolve --mark a/b' |
130 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
146 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
131 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
147 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
132 [1] |
148 [1] |
133 $ hg mv a/b~2ea68033e3be a/b.old |
149 $ hg mv a/b~2ea68033e3be a/b.old |
|
150 |
|
151 #if symlink |
134 $ readlink.py a/b.old |
152 $ readlink.py a/b.old |
135 a/b.old -> c |
153 a/b.old -> c |
|
154 #else |
|
155 $ cat a/b.old |
|
156 c (no-eol) |
|
157 #endif |
|
158 |
136 $ hg resolve --mark a/b |
159 $ hg resolve --mark a/b |
137 (no more unresolved files) |
160 (no more unresolved files) |
138 $ hg commit -m "merge link (rename link)" |
161 $ hg commit -m "merge link (rename link)" |