Show More
@@ -1,755 +1,755 b'' | |||||
1 | #require p4 execbit symlink |
|
1 | #require p4 execbit symlink | |
2 |
|
2 | |||
3 | $ echo "[extensions]" >> $HGRCPATH |
|
3 | $ echo "[extensions]" >> $HGRCPATH | |
4 | $ echo "convert = " >> $HGRCPATH |
|
4 | $ echo "convert = " >> $HGRCPATH | |
5 |
|
5 | |||
6 | create p4 depot |
|
6 | create p4 depot | |
7 | $ P4ROOT=`pwd`/depot; export P4ROOT |
|
7 | $ P4ROOT=`pwd`/depot; export P4ROOT | |
8 | $ P4AUDIT=$P4ROOT/audit; export P4AUDIT |
|
8 | $ P4AUDIT=$P4ROOT/audit; export P4AUDIT | |
9 | $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL |
|
9 | $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL | |
10 | $ P4LOG=$P4ROOT/log; export P4LOG |
|
10 | $ P4LOG=$P4ROOT/log; export P4LOG | |
11 | $ P4PORT=localhost:$HGPORT; export P4PORT |
|
11 | $ P4PORT=localhost:$HGPORT; export P4PORT | |
12 | $ P4DEBUG=1; export P4DEBUG |
|
12 | $ P4DEBUG=1; export P4DEBUG | |
13 | $ P4CHARSET=utf8; export P4CHARSET |
|
13 | $ P4CHARSET=utf8; export P4CHARSET | |
14 |
|
14 | |||
15 | start the p4 server |
|
15 | start the p4 server | |
16 | $ [ ! -d $P4ROOT ] && mkdir $P4ROOT |
|
16 | $ [ ! -d $P4ROOT ] && mkdir $P4ROOT | |
17 | $ p4d -f -J off -xi >$P4ROOT/stdout 2>$P4ROOT/stderr |
|
17 | $ p4d -f -J off -xi >$P4ROOT/stdout 2>$P4ROOT/stderr | |
18 | $ p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr & |
|
18 | $ p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr & | |
19 | $ echo $! >> $DAEMON_PIDS |
|
19 | $ echo $! >> $DAEMON_PIDS | |
20 | $ trap "echo stopping the p4 server ; p4 admin stop" EXIT |
|
20 | $ trap "echo stopping the p4 server ; p4 admin stop" EXIT | |
21 |
|
21 | |||
22 | wait for the server to initialize |
|
22 | wait for the server to initialize | |
23 | $ while ! p4 ; do |
|
23 | $ while ! p4 ; do | |
24 | > sleep 1 |
|
24 | > sleep 1 | |
25 | > done >/dev/null 2>/dev/null |
|
25 | > done >/dev/null 2>/dev/null | |
26 |
|
26 | |||
27 | create a client spec |
|
27 | create a client spec | |
28 | $ P4CLIENT=hg-p4-import; export P4CLIENT |
|
28 | $ P4CLIENT=hg-p4-import; export P4CLIENT | |
29 | $ DEPOTPATH=//depot/test-mercurial-import/... |
|
29 | $ DEPOTPATH=//depot/test-mercurial-import/... | |
30 | $ p4 client -o | sed '/^View:/,$ d' >p4client |
|
30 | $ p4 client -o | sed '/^View:/,$ d' >p4client | |
31 | $ echo View: >>p4client |
|
31 | $ echo View: >>p4client | |
32 | $ echo " $DEPOTPATH //$P4CLIENT/..." >>p4client |
|
32 | $ echo " $DEPOTPATH //$P4CLIENT/..." >>p4client | |
33 | $ p4 client -i <p4client |
|
33 | $ p4 client -i <p4client | |
34 | Client hg-p4-import saved. |
|
34 | Client hg-p4-import saved. | |
35 |
|
35 | |||
36 | populate the depot |
|
36 | populate the depot | |
37 | $ TYPES="text binary symlink" |
|
37 | $ TYPES="text binary symlink" | |
38 | $ TYPES="$TYPES text+m text+w text+x text+k text+kx text+ko text+l text+C text+D text+F text+S text+S2" |
|
38 | $ TYPES="$TYPES text+m text+w text+x text+k text+kx text+ko text+l text+C text+D text+F text+S text+S2" | |
39 | $ TYPES="$TYPES binary+k binary+x binary+kx symlink+k" |
|
39 | $ TYPES="$TYPES binary+k binary+x binary+kx symlink+k" | |
40 | $ TYPES="$TYPES ctext cxtext ktext kxtext ltext tempobj ubinary uxbinary xbinary xltext xtempobj xtext" |
|
40 | $ TYPES="$TYPES ctext cxtext ktext kxtext ltext tempobj ubinary uxbinary xbinary xltext xtempobj xtext" | |
41 | not testing these |
|
41 | not testing these | |
42 | $ #TYPES="$TYPES apple resource unicode utf16 uresource xunicode xutf16" |
|
42 | $ #TYPES="$TYPES apple resource unicode utf16 uresource xunicode xutf16" | |
43 | $ for T in $TYPES ; do |
|
43 | $ for T in $TYPES ; do | |
44 | > T2=`echo $T | tr [:upper:] [:lower:]` |
|
44 | > T2=`echo $T | tr [:upper:] [:lower:]` | |
45 | > case $T in |
|
45 | > case $T in | |
46 | > apple) |
|
46 | > apple) | |
47 | > ;; |
|
47 | > ;; | |
48 | > symlink*) |
|
48 | > symlink*) | |
49 | > echo "this is target $T" >target_$T2 |
|
49 | > echo "this is target $T" >target_$T2 | |
50 | > ln -s target_$T file_$T2 |
|
50 | > ln -s target_$T file_$T2 | |
51 | > p4 add target_$T2 |
|
51 | > p4 add target_$T2 | |
52 | > p4 add -t $T file_$T2 |
|
52 | > p4 add -t $T file_$T2 | |
53 | > ;; |
|
53 | > ;; | |
54 | > binary*) |
|
54 | > binary*) | |
55 |
> $PYTHON -c " |
|
55 | > $PYTHON -c "open('file_$T2', 'wb').write(b'this is $T')" | |
56 | > p4 add -t $T file_$T2 |
|
56 | > p4 add -t $T file_$T2 | |
57 | > ;; |
|
57 | > ;; | |
58 | > *) |
|
58 | > *) | |
59 | > echo "this is $T" >file_$T2 |
|
59 | > echo "this is $T" >file_$T2 | |
60 | > p4 add -t $T file_$T2 |
|
60 | > p4 add -t $T file_$T2 | |
61 | > ;; |
|
61 | > ;; | |
62 | > esac |
|
62 | > esac | |
63 | > done |
|
63 | > done | |
64 | //depot/test-mercurial-import/file_text#1 - opened for add |
|
64 | //depot/test-mercurial-import/file_text#1 - opened for add | |
65 | //depot/test-mercurial-import/file_binary#1 - opened for add |
|
65 | //depot/test-mercurial-import/file_binary#1 - opened for add | |
66 | //depot/test-mercurial-import/target_symlink#1 - opened for add |
|
66 | //depot/test-mercurial-import/target_symlink#1 - opened for add | |
67 | //depot/test-mercurial-import/file_symlink#1 - opened for add |
|
67 | //depot/test-mercurial-import/file_symlink#1 - opened for add | |
68 | //depot/test-mercurial-import/file_text+m#1 - opened for add |
|
68 | //depot/test-mercurial-import/file_text+m#1 - opened for add | |
69 | //depot/test-mercurial-import/file_text+w#1 - opened for add |
|
69 | //depot/test-mercurial-import/file_text+w#1 - opened for add | |
70 | //depot/test-mercurial-import/file_text+x#1 - opened for add |
|
70 | //depot/test-mercurial-import/file_text+x#1 - opened for add | |
71 | //depot/test-mercurial-import/file_text+k#1 - opened for add |
|
71 | //depot/test-mercurial-import/file_text+k#1 - opened for add | |
72 | //depot/test-mercurial-import/file_text+kx#1 - opened for add |
|
72 | //depot/test-mercurial-import/file_text+kx#1 - opened for add | |
73 | //depot/test-mercurial-import/file_text+ko#1 - opened for add |
|
73 | //depot/test-mercurial-import/file_text+ko#1 - opened for add | |
74 | //depot/test-mercurial-import/file_text+l#1 - opened for add |
|
74 | //depot/test-mercurial-import/file_text+l#1 - opened for add | |
75 | //depot/test-mercurial-import/file_text+c#1 - opened for add |
|
75 | //depot/test-mercurial-import/file_text+c#1 - opened for add | |
76 | //depot/test-mercurial-import/file_text+d#1 - opened for add |
|
76 | //depot/test-mercurial-import/file_text+d#1 - opened for add | |
77 | //depot/test-mercurial-import/file_text+f#1 - opened for add |
|
77 | //depot/test-mercurial-import/file_text+f#1 - opened for add | |
78 | //depot/test-mercurial-import/file_text+s#1 - opened for add |
|
78 | //depot/test-mercurial-import/file_text+s#1 - opened for add | |
79 | //depot/test-mercurial-import/file_text+s2#1 - opened for add |
|
79 | //depot/test-mercurial-import/file_text+s2#1 - opened for add | |
80 | //depot/test-mercurial-import/file_binary+k#1 - opened for add |
|
80 | //depot/test-mercurial-import/file_binary+k#1 - opened for add | |
81 | //depot/test-mercurial-import/file_binary+x#1 - opened for add |
|
81 | //depot/test-mercurial-import/file_binary+x#1 - opened for add | |
82 | //depot/test-mercurial-import/file_binary+kx#1 - opened for add |
|
82 | //depot/test-mercurial-import/file_binary+kx#1 - opened for add | |
83 | //depot/test-mercurial-import/target_symlink+k#1 - opened for add |
|
83 | //depot/test-mercurial-import/target_symlink+k#1 - opened for add | |
84 | //depot/test-mercurial-import/file_symlink+k#1 - opened for add |
|
84 | //depot/test-mercurial-import/file_symlink+k#1 - opened for add | |
85 | //depot/test-mercurial-import/file_ctext#1 - opened for add |
|
85 | //depot/test-mercurial-import/file_ctext#1 - opened for add | |
86 | //depot/test-mercurial-import/file_cxtext#1 - opened for add |
|
86 | //depot/test-mercurial-import/file_cxtext#1 - opened for add | |
87 | //depot/test-mercurial-import/file_ktext#1 - opened for add |
|
87 | //depot/test-mercurial-import/file_ktext#1 - opened for add | |
88 | //depot/test-mercurial-import/file_kxtext#1 - opened for add |
|
88 | //depot/test-mercurial-import/file_kxtext#1 - opened for add | |
89 | //depot/test-mercurial-import/file_ltext#1 - opened for add |
|
89 | //depot/test-mercurial-import/file_ltext#1 - opened for add | |
90 | //depot/test-mercurial-import/file_tempobj#1 - opened for add |
|
90 | //depot/test-mercurial-import/file_tempobj#1 - opened for add | |
91 | //depot/test-mercurial-import/file_ubinary#1 - opened for add |
|
91 | //depot/test-mercurial-import/file_ubinary#1 - opened for add | |
92 | //depot/test-mercurial-import/file_uxbinary#1 - opened for add |
|
92 | //depot/test-mercurial-import/file_uxbinary#1 - opened for add | |
93 | //depot/test-mercurial-import/file_xbinary#1 - opened for add |
|
93 | //depot/test-mercurial-import/file_xbinary#1 - opened for add | |
94 | //depot/test-mercurial-import/file_xltext#1 - opened for add |
|
94 | //depot/test-mercurial-import/file_xltext#1 - opened for add | |
95 | //depot/test-mercurial-import/file_xtempobj#1 - opened for add |
|
95 | //depot/test-mercurial-import/file_xtempobj#1 - opened for add | |
96 | //depot/test-mercurial-import/file_xtext#1 - opened for add |
|
96 | //depot/test-mercurial-import/file_xtext#1 - opened for add | |
97 | $ p4 submit -d initial |
|
97 | $ p4 submit -d initial | |
98 | Submitting change 1. |
|
98 | Submitting change 1. | |
99 | Locking 33 files ... |
|
99 | Locking 33 files ... | |
100 | add //depot/test-mercurial-import/file_binary#1 |
|
100 | add //depot/test-mercurial-import/file_binary#1 | |
101 | add //depot/test-mercurial-import/file_binary+k#1 |
|
101 | add //depot/test-mercurial-import/file_binary+k#1 | |
102 | add //depot/test-mercurial-import/file_binary+kx#1 |
|
102 | add //depot/test-mercurial-import/file_binary+kx#1 | |
103 | add //depot/test-mercurial-import/file_binary+x#1 |
|
103 | add //depot/test-mercurial-import/file_binary+x#1 | |
104 | add //depot/test-mercurial-import/file_ctext#1 |
|
104 | add //depot/test-mercurial-import/file_ctext#1 | |
105 | add //depot/test-mercurial-import/file_cxtext#1 |
|
105 | add //depot/test-mercurial-import/file_cxtext#1 | |
106 | add //depot/test-mercurial-import/file_ktext#1 |
|
106 | add //depot/test-mercurial-import/file_ktext#1 | |
107 | add //depot/test-mercurial-import/file_kxtext#1 |
|
107 | add //depot/test-mercurial-import/file_kxtext#1 | |
108 | add //depot/test-mercurial-import/file_ltext#1 |
|
108 | add //depot/test-mercurial-import/file_ltext#1 | |
109 | add //depot/test-mercurial-import/file_symlink#1 |
|
109 | add //depot/test-mercurial-import/file_symlink#1 | |
110 | add //depot/test-mercurial-import/file_symlink+k#1 |
|
110 | add //depot/test-mercurial-import/file_symlink+k#1 | |
111 | add //depot/test-mercurial-import/file_tempobj#1 |
|
111 | add //depot/test-mercurial-import/file_tempobj#1 | |
112 | add //depot/test-mercurial-import/file_text#1 |
|
112 | add //depot/test-mercurial-import/file_text#1 | |
113 | add //depot/test-mercurial-import/file_text+c#1 |
|
113 | add //depot/test-mercurial-import/file_text+c#1 | |
114 | add //depot/test-mercurial-import/file_text+d#1 |
|
114 | add //depot/test-mercurial-import/file_text+d#1 | |
115 | add //depot/test-mercurial-import/file_text+f#1 |
|
115 | add //depot/test-mercurial-import/file_text+f#1 | |
116 | add //depot/test-mercurial-import/file_text+k#1 |
|
116 | add //depot/test-mercurial-import/file_text+k#1 | |
117 | add //depot/test-mercurial-import/file_text+ko#1 |
|
117 | add //depot/test-mercurial-import/file_text+ko#1 | |
118 | add //depot/test-mercurial-import/file_text+kx#1 |
|
118 | add //depot/test-mercurial-import/file_text+kx#1 | |
119 | add //depot/test-mercurial-import/file_text+l#1 |
|
119 | add //depot/test-mercurial-import/file_text+l#1 | |
120 | add //depot/test-mercurial-import/file_text+m#1 |
|
120 | add //depot/test-mercurial-import/file_text+m#1 | |
121 | add //depot/test-mercurial-import/file_text+s#1 |
|
121 | add //depot/test-mercurial-import/file_text+s#1 | |
122 | add //depot/test-mercurial-import/file_text+s2#1 |
|
122 | add //depot/test-mercurial-import/file_text+s2#1 | |
123 | add //depot/test-mercurial-import/file_text+w#1 |
|
123 | add //depot/test-mercurial-import/file_text+w#1 | |
124 | add //depot/test-mercurial-import/file_text+x#1 |
|
124 | add //depot/test-mercurial-import/file_text+x#1 | |
125 | add //depot/test-mercurial-import/file_ubinary#1 |
|
125 | add //depot/test-mercurial-import/file_ubinary#1 | |
126 | add //depot/test-mercurial-import/file_uxbinary#1 |
|
126 | add //depot/test-mercurial-import/file_uxbinary#1 | |
127 | add //depot/test-mercurial-import/file_xbinary#1 |
|
127 | add //depot/test-mercurial-import/file_xbinary#1 | |
128 | add //depot/test-mercurial-import/file_xltext#1 |
|
128 | add //depot/test-mercurial-import/file_xltext#1 | |
129 | add //depot/test-mercurial-import/file_xtempobj#1 |
|
129 | add //depot/test-mercurial-import/file_xtempobj#1 | |
130 | add //depot/test-mercurial-import/file_xtext#1 |
|
130 | add //depot/test-mercurial-import/file_xtext#1 | |
131 | add //depot/test-mercurial-import/target_symlink#1 |
|
131 | add //depot/test-mercurial-import/target_symlink#1 | |
132 | add //depot/test-mercurial-import/target_symlink+k#1 |
|
132 | add //depot/test-mercurial-import/target_symlink+k#1 | |
133 | Change 1 submitted. |
|
133 | Change 1 submitted. | |
134 | //depot/test-mercurial-import/file_binary+k#1 - refreshing |
|
134 | //depot/test-mercurial-import/file_binary+k#1 - refreshing | |
135 | //depot/test-mercurial-import/file_binary+kx#1 - refreshing |
|
135 | //depot/test-mercurial-import/file_binary+kx#1 - refreshing | |
136 | //depot/test-mercurial-import/file_ktext#1 - refreshing |
|
136 | //depot/test-mercurial-import/file_ktext#1 - refreshing | |
137 | //depot/test-mercurial-import/file_kxtext#1 - refreshing |
|
137 | //depot/test-mercurial-import/file_kxtext#1 - refreshing | |
138 | //depot/test-mercurial-import/file_symlink+k#1 - refreshing |
|
138 | //depot/test-mercurial-import/file_symlink+k#1 - refreshing | |
139 | //depot/test-mercurial-import/file_text+k#1 - refreshing |
|
139 | //depot/test-mercurial-import/file_text+k#1 - refreshing | |
140 | //depot/test-mercurial-import/file_text+ko#1 - refreshing |
|
140 | //depot/test-mercurial-import/file_text+ko#1 - refreshing | |
141 | //depot/test-mercurial-import/file_text+kx#1 - refreshing |
|
141 | //depot/test-mercurial-import/file_text+kx#1 - refreshing | |
142 |
|
142 | |||
143 | test keyword expansion |
|
143 | test keyword expansion | |
144 | $ p4 edit file_* target_* |
|
144 | $ p4 edit file_* target_* | |
145 | //depot/test-mercurial-import/file_binary#1 - opened for edit |
|
145 | //depot/test-mercurial-import/file_binary#1 - opened for edit | |
146 | //depot/test-mercurial-import/file_binary+k#1 - opened for edit |
|
146 | //depot/test-mercurial-import/file_binary+k#1 - opened for edit | |
147 | //depot/test-mercurial-import/file_binary+kx#1 - opened for edit |
|
147 | //depot/test-mercurial-import/file_binary+kx#1 - opened for edit | |
148 | //depot/test-mercurial-import/file_binary+x#1 - opened for edit |
|
148 | //depot/test-mercurial-import/file_binary+x#1 - opened for edit | |
149 | //depot/test-mercurial-import/file_ctext#1 - opened for edit |
|
149 | //depot/test-mercurial-import/file_ctext#1 - opened for edit | |
150 | //depot/test-mercurial-import/file_cxtext#1 - opened for edit |
|
150 | //depot/test-mercurial-import/file_cxtext#1 - opened for edit | |
151 | //depot/test-mercurial-import/file_ktext#1 - opened for edit |
|
151 | //depot/test-mercurial-import/file_ktext#1 - opened for edit | |
152 | //depot/test-mercurial-import/file_kxtext#1 - opened for edit |
|
152 | //depot/test-mercurial-import/file_kxtext#1 - opened for edit | |
153 | //depot/test-mercurial-import/file_ltext#1 - opened for edit |
|
153 | //depot/test-mercurial-import/file_ltext#1 - opened for edit | |
154 | //depot/test-mercurial-import/file_symlink#1 - opened for edit |
|
154 | //depot/test-mercurial-import/file_symlink#1 - opened for edit | |
155 | //depot/test-mercurial-import/file_symlink+k#1 - opened for edit |
|
155 | //depot/test-mercurial-import/file_symlink+k#1 - opened for edit | |
156 | //depot/test-mercurial-import/file_tempobj#1 - opened for edit |
|
156 | //depot/test-mercurial-import/file_tempobj#1 - opened for edit | |
157 | //depot/test-mercurial-import/file_text#1 - opened for edit |
|
157 | //depot/test-mercurial-import/file_text#1 - opened for edit | |
158 | //depot/test-mercurial-import/file_text+c#1 - opened for edit |
|
158 | //depot/test-mercurial-import/file_text+c#1 - opened for edit | |
159 | //depot/test-mercurial-import/file_text+d#1 - opened for edit |
|
159 | //depot/test-mercurial-import/file_text+d#1 - opened for edit | |
160 | //depot/test-mercurial-import/file_text+f#1 - opened for edit |
|
160 | //depot/test-mercurial-import/file_text+f#1 - opened for edit | |
161 | //depot/test-mercurial-import/file_text+k#1 - opened for edit |
|
161 | //depot/test-mercurial-import/file_text+k#1 - opened for edit | |
162 | //depot/test-mercurial-import/file_text+ko#1 - opened for edit |
|
162 | //depot/test-mercurial-import/file_text+ko#1 - opened for edit | |
163 | //depot/test-mercurial-import/file_text+kx#1 - opened for edit |
|
163 | //depot/test-mercurial-import/file_text+kx#1 - opened for edit | |
164 | //depot/test-mercurial-import/file_text+l#1 - opened for edit |
|
164 | //depot/test-mercurial-import/file_text+l#1 - opened for edit | |
165 | //depot/test-mercurial-import/file_text+m#1 - opened for edit |
|
165 | //depot/test-mercurial-import/file_text+m#1 - opened for edit | |
166 | //depot/test-mercurial-import/file_text+s#1 - opened for edit |
|
166 | //depot/test-mercurial-import/file_text+s#1 - opened for edit | |
167 | //depot/test-mercurial-import/file_text+s2#1 - opened for edit |
|
167 | //depot/test-mercurial-import/file_text+s2#1 - opened for edit | |
168 | //depot/test-mercurial-import/file_text+w#1 - opened for edit |
|
168 | //depot/test-mercurial-import/file_text+w#1 - opened for edit | |
169 | //depot/test-mercurial-import/file_text+x#1 - opened for edit |
|
169 | //depot/test-mercurial-import/file_text+x#1 - opened for edit | |
170 | //depot/test-mercurial-import/file_ubinary#1 - opened for edit |
|
170 | //depot/test-mercurial-import/file_ubinary#1 - opened for edit | |
171 | //depot/test-mercurial-import/file_uxbinary#1 - opened for edit |
|
171 | //depot/test-mercurial-import/file_uxbinary#1 - opened for edit | |
172 | //depot/test-mercurial-import/file_xbinary#1 - opened for edit |
|
172 | //depot/test-mercurial-import/file_xbinary#1 - opened for edit | |
173 | //depot/test-mercurial-import/file_xltext#1 - opened for edit |
|
173 | //depot/test-mercurial-import/file_xltext#1 - opened for edit | |
174 | //depot/test-mercurial-import/file_xtempobj#1 - opened for edit |
|
174 | //depot/test-mercurial-import/file_xtempobj#1 - opened for edit | |
175 | //depot/test-mercurial-import/file_xtext#1 - opened for edit |
|
175 | //depot/test-mercurial-import/file_xtext#1 - opened for edit | |
176 | //depot/test-mercurial-import/target_symlink#1 - opened for edit |
|
176 | //depot/test-mercurial-import/target_symlink#1 - opened for edit | |
177 | //depot/test-mercurial-import/target_symlink+k#1 - opened for edit |
|
177 | //depot/test-mercurial-import/target_symlink+k#1 - opened for edit | |
178 | $ for T in $TYPES ; do |
|
178 | $ for T in $TYPES ; do | |
179 | > T2=`echo $T | tr [:upper:] [:lower:]` |
|
179 | > T2=`echo $T | tr [:upper:] [:lower:]` | |
180 | > echo '$Id$' >>file_$T2 |
|
180 | > echo '$Id$' >>file_$T2 | |
181 | > echo '$Header$' >>file_$T2 |
|
181 | > echo '$Header$' >>file_$T2 | |
182 | > echo '$Date$' >>file_$T2 |
|
182 | > echo '$Date$' >>file_$T2 | |
183 | > echo '$DateTime$' >>file_$T2 |
|
183 | > echo '$DateTime$' >>file_$T2 | |
184 | > echo '$Change$' >>file_$T2 |
|
184 | > echo '$Change$' >>file_$T2 | |
185 | > echo '$File$' >>file_$T2 |
|
185 | > echo '$File$' >>file_$T2 | |
186 | > echo '$Revision$' >>file_$T2 |
|
186 | > echo '$Revision$' >>file_$T2 | |
187 | > echo '$Header$$Header$Header$' >>file_$T2 |
|
187 | > echo '$Header$$Header$Header$' >>file_$T2 | |
188 | > done |
|
188 | > done | |
189 |
|
189 | |||
190 | $ ln -s 'target_$Header$' crazy_symlink+k |
|
190 | $ ln -s 'target_$Header$' crazy_symlink+k | |
191 | $ p4 add -t symlink+k crazy_symlink+k |
|
191 | $ p4 add -t symlink+k crazy_symlink+k | |
192 | //depot/test-mercurial-import/crazy_symlink+k#1 - opened for add |
|
192 | //depot/test-mercurial-import/crazy_symlink+k#1 - opened for add | |
193 |
|
193 | |||
194 | $ p4 submit -d keywords |
|
194 | $ p4 submit -d keywords | |
195 | Submitting change 2. |
|
195 | Submitting change 2. | |
196 | Locking 34 files ... |
|
196 | Locking 34 files ... | |
197 | add //depot/test-mercurial-import/crazy_symlink+k#1 |
|
197 | add //depot/test-mercurial-import/crazy_symlink+k#1 | |
198 | edit //depot/test-mercurial-import/file_binary#2 |
|
198 | edit //depot/test-mercurial-import/file_binary#2 | |
199 | edit //depot/test-mercurial-import/file_binary+k#2 |
|
199 | edit //depot/test-mercurial-import/file_binary+k#2 | |
200 | edit //depot/test-mercurial-import/file_binary+kx#2 |
|
200 | edit //depot/test-mercurial-import/file_binary+kx#2 | |
201 | edit //depot/test-mercurial-import/file_binary+x#2 |
|
201 | edit //depot/test-mercurial-import/file_binary+x#2 | |
202 | edit //depot/test-mercurial-import/file_ctext#2 |
|
202 | edit //depot/test-mercurial-import/file_ctext#2 | |
203 | edit //depot/test-mercurial-import/file_cxtext#2 |
|
203 | edit //depot/test-mercurial-import/file_cxtext#2 | |
204 | edit //depot/test-mercurial-import/file_ktext#2 |
|
204 | edit //depot/test-mercurial-import/file_ktext#2 | |
205 | edit //depot/test-mercurial-import/file_kxtext#2 |
|
205 | edit //depot/test-mercurial-import/file_kxtext#2 | |
206 | edit //depot/test-mercurial-import/file_ltext#2 |
|
206 | edit //depot/test-mercurial-import/file_ltext#2 | |
207 | edit //depot/test-mercurial-import/file_symlink#2 |
|
207 | edit //depot/test-mercurial-import/file_symlink#2 | |
208 | edit //depot/test-mercurial-import/file_symlink+k#2 |
|
208 | edit //depot/test-mercurial-import/file_symlink+k#2 | |
209 | edit //depot/test-mercurial-import/file_tempobj#2 |
|
209 | edit //depot/test-mercurial-import/file_tempobj#2 | |
210 | edit //depot/test-mercurial-import/file_text#2 |
|
210 | edit //depot/test-mercurial-import/file_text#2 | |
211 | edit //depot/test-mercurial-import/file_text+c#2 |
|
211 | edit //depot/test-mercurial-import/file_text+c#2 | |
212 | edit //depot/test-mercurial-import/file_text+d#2 |
|
212 | edit //depot/test-mercurial-import/file_text+d#2 | |
213 | edit //depot/test-mercurial-import/file_text+f#2 |
|
213 | edit //depot/test-mercurial-import/file_text+f#2 | |
214 | edit //depot/test-mercurial-import/file_text+k#2 |
|
214 | edit //depot/test-mercurial-import/file_text+k#2 | |
215 | edit //depot/test-mercurial-import/file_text+ko#2 |
|
215 | edit //depot/test-mercurial-import/file_text+ko#2 | |
216 | edit //depot/test-mercurial-import/file_text+kx#2 |
|
216 | edit //depot/test-mercurial-import/file_text+kx#2 | |
217 | edit //depot/test-mercurial-import/file_text+l#2 |
|
217 | edit //depot/test-mercurial-import/file_text+l#2 | |
218 | edit //depot/test-mercurial-import/file_text+m#2 |
|
218 | edit //depot/test-mercurial-import/file_text+m#2 | |
219 | edit //depot/test-mercurial-import/file_text+s#2 |
|
219 | edit //depot/test-mercurial-import/file_text+s#2 | |
220 | edit //depot/test-mercurial-import/file_text+s2#2 |
|
220 | edit //depot/test-mercurial-import/file_text+s2#2 | |
221 | edit //depot/test-mercurial-import/file_text+w#2 |
|
221 | edit //depot/test-mercurial-import/file_text+w#2 | |
222 | edit //depot/test-mercurial-import/file_text+x#2 |
|
222 | edit //depot/test-mercurial-import/file_text+x#2 | |
223 | edit //depot/test-mercurial-import/file_ubinary#2 |
|
223 | edit //depot/test-mercurial-import/file_ubinary#2 | |
224 | edit //depot/test-mercurial-import/file_uxbinary#2 |
|
224 | edit //depot/test-mercurial-import/file_uxbinary#2 | |
225 | edit //depot/test-mercurial-import/file_xbinary#2 |
|
225 | edit //depot/test-mercurial-import/file_xbinary#2 | |
226 | edit //depot/test-mercurial-import/file_xltext#2 |
|
226 | edit //depot/test-mercurial-import/file_xltext#2 | |
227 | edit //depot/test-mercurial-import/file_xtempobj#2 |
|
227 | edit //depot/test-mercurial-import/file_xtempobj#2 | |
228 | edit //depot/test-mercurial-import/file_xtext#2 |
|
228 | edit //depot/test-mercurial-import/file_xtext#2 | |
229 | edit //depot/test-mercurial-import/target_symlink#2 |
|
229 | edit //depot/test-mercurial-import/target_symlink#2 | |
230 | edit //depot/test-mercurial-import/target_symlink+k#2 |
|
230 | edit //depot/test-mercurial-import/target_symlink+k#2 | |
231 | Change 2 submitted. |
|
231 | Change 2 submitted. | |
232 | //depot/test-mercurial-import/crazy_symlink+k#1 - refreshing |
|
232 | //depot/test-mercurial-import/crazy_symlink+k#1 - refreshing | |
233 | //depot/test-mercurial-import/file_binary+k#2 - refreshing |
|
233 | //depot/test-mercurial-import/file_binary+k#2 - refreshing | |
234 | //depot/test-mercurial-import/file_binary+kx#2 - refreshing |
|
234 | //depot/test-mercurial-import/file_binary+kx#2 - refreshing | |
235 | //depot/test-mercurial-import/file_ktext#2 - refreshing |
|
235 | //depot/test-mercurial-import/file_ktext#2 - refreshing | |
236 | //depot/test-mercurial-import/file_kxtext#2 - refreshing |
|
236 | //depot/test-mercurial-import/file_kxtext#2 - refreshing | |
237 | //depot/test-mercurial-import/file_symlink+k#2 - refreshing |
|
237 | //depot/test-mercurial-import/file_symlink+k#2 - refreshing | |
238 | //depot/test-mercurial-import/file_text+k#2 - refreshing |
|
238 | //depot/test-mercurial-import/file_text+k#2 - refreshing | |
239 | //depot/test-mercurial-import/file_text+ko#2 - refreshing |
|
239 | //depot/test-mercurial-import/file_text+ko#2 - refreshing | |
240 | //depot/test-mercurial-import/file_text+kx#2 - refreshing |
|
240 | //depot/test-mercurial-import/file_text+kx#2 - refreshing | |
241 |
|
241 | |||
242 | check keywords in p4 |
|
242 | check keywords in p4 | |
243 | $ grep -H Header file_* |
|
243 | $ grep -H Header file_* | |
244 | file_binary:$Header$ |
|
244 | file_binary:$Header$ | |
245 | file_binary:$Header$$Header$Header$ |
|
245 | file_binary:$Header$$Header$Header$ | |
246 | file_binary+k:$Header: //depot/test-mercurial-import/file_binary+k#2 $ |
|
246 | file_binary+k:$Header: //depot/test-mercurial-import/file_binary+k#2 $ | |
247 | file_binary+k:$Header: //depot/test-mercurial-import/file_binary+k#2 $$Header: //depot/test-mercurial-import/file_binary+k#2 $Header$ |
|
247 | file_binary+k:$Header: //depot/test-mercurial-import/file_binary+k#2 $$Header: //depot/test-mercurial-import/file_binary+k#2 $Header$ | |
248 | file_binary+kx:$Header: //depot/test-mercurial-import/file_binary+kx#2 $ |
|
248 | file_binary+kx:$Header: //depot/test-mercurial-import/file_binary+kx#2 $ | |
249 | file_binary+kx:$Header: //depot/test-mercurial-import/file_binary+kx#2 $$Header: //depot/test-mercurial-import/file_binary+kx#2 $Header$ |
|
249 | file_binary+kx:$Header: //depot/test-mercurial-import/file_binary+kx#2 $$Header: //depot/test-mercurial-import/file_binary+kx#2 $Header$ | |
250 | file_binary+x:$Header$ |
|
250 | file_binary+x:$Header$ | |
251 | file_binary+x:$Header$$Header$Header$ |
|
251 | file_binary+x:$Header$$Header$Header$ | |
252 | file_ctext:$Header$ |
|
252 | file_ctext:$Header$ | |
253 | file_ctext:$Header$$Header$Header$ |
|
253 | file_ctext:$Header$$Header$Header$ | |
254 | file_cxtext:$Header$ |
|
254 | file_cxtext:$Header$ | |
255 | file_cxtext:$Header$$Header$Header$ |
|
255 | file_cxtext:$Header$$Header$Header$ | |
256 | file_ktext:$Header: //depot/test-mercurial-import/file_ktext#2 $ |
|
256 | file_ktext:$Header: //depot/test-mercurial-import/file_ktext#2 $ | |
257 | file_ktext:$Header: //depot/test-mercurial-import/file_ktext#2 $$Header: //depot/test-mercurial-import/file_ktext#2 $Header$ |
|
257 | file_ktext:$Header: //depot/test-mercurial-import/file_ktext#2 $$Header: //depot/test-mercurial-import/file_ktext#2 $Header$ | |
258 | file_kxtext:$Header: //depot/test-mercurial-import/file_kxtext#2 $ |
|
258 | file_kxtext:$Header: //depot/test-mercurial-import/file_kxtext#2 $ | |
259 | file_kxtext:$Header: //depot/test-mercurial-import/file_kxtext#2 $$Header: //depot/test-mercurial-import/file_kxtext#2 $Header$ |
|
259 | file_kxtext:$Header: //depot/test-mercurial-import/file_kxtext#2 $$Header: //depot/test-mercurial-import/file_kxtext#2 $Header$ | |
260 | file_ltext:$Header$ |
|
260 | file_ltext:$Header$ | |
261 | file_ltext:$Header$$Header$Header$ |
|
261 | file_ltext:$Header$$Header$Header$ | |
262 | file_symlink:$Header$ |
|
262 | file_symlink:$Header$ | |
263 | file_symlink:$Header$$Header$Header$ |
|
263 | file_symlink:$Header$$Header$Header$ | |
264 | file_symlink+k:$Header$ |
|
264 | file_symlink+k:$Header$ | |
265 | file_symlink+k:$Header$$Header$Header$ |
|
265 | file_symlink+k:$Header$$Header$Header$ | |
266 | file_tempobj:$Header$ |
|
266 | file_tempobj:$Header$ | |
267 | file_tempobj:$Header$$Header$Header$ |
|
267 | file_tempobj:$Header$$Header$Header$ | |
268 | file_text:$Header$ |
|
268 | file_text:$Header$ | |
269 | file_text:$Header$$Header$Header$ |
|
269 | file_text:$Header$$Header$Header$ | |
270 | file_text+c:$Header$ |
|
270 | file_text+c:$Header$ | |
271 | file_text+c:$Header$$Header$Header$ |
|
271 | file_text+c:$Header$$Header$Header$ | |
272 | file_text+d:$Header$ |
|
272 | file_text+d:$Header$ | |
273 | file_text+d:$Header$$Header$Header$ |
|
273 | file_text+d:$Header$$Header$Header$ | |
274 | file_text+f:$Header$ |
|
274 | file_text+f:$Header$ | |
275 | file_text+f:$Header$$Header$Header$ |
|
275 | file_text+f:$Header$$Header$Header$ | |
276 | file_text+k:$Header: //depot/test-mercurial-import/file_text+k#2 $ |
|
276 | file_text+k:$Header: //depot/test-mercurial-import/file_text+k#2 $ | |
277 | file_text+k:$Header: //depot/test-mercurial-import/file_text+k#2 $$Header: //depot/test-mercurial-import/file_text+k#2 $Header$ |
|
277 | file_text+k:$Header: //depot/test-mercurial-import/file_text+k#2 $$Header: //depot/test-mercurial-import/file_text+k#2 $Header$ | |
278 | file_text+ko:$Header: //depot/test-mercurial-import/file_text+ko#2 $ |
|
278 | file_text+ko:$Header: //depot/test-mercurial-import/file_text+ko#2 $ | |
279 | file_text+ko:$Header: //depot/test-mercurial-import/file_text+ko#2 $$Header: //depot/test-mercurial-import/file_text+ko#2 $Header$ |
|
279 | file_text+ko:$Header: //depot/test-mercurial-import/file_text+ko#2 $$Header: //depot/test-mercurial-import/file_text+ko#2 $Header$ | |
280 | file_text+kx:$Header: //depot/test-mercurial-import/file_text+kx#2 $ |
|
280 | file_text+kx:$Header: //depot/test-mercurial-import/file_text+kx#2 $ | |
281 | file_text+kx:$Header: //depot/test-mercurial-import/file_text+kx#2 $$Header: //depot/test-mercurial-import/file_text+kx#2 $Header$ |
|
281 | file_text+kx:$Header: //depot/test-mercurial-import/file_text+kx#2 $$Header: //depot/test-mercurial-import/file_text+kx#2 $Header$ | |
282 | file_text+l:$Header$ |
|
282 | file_text+l:$Header$ | |
283 | file_text+l:$Header$$Header$Header$ |
|
283 | file_text+l:$Header$$Header$Header$ | |
284 | file_text+m:$Header$ |
|
284 | file_text+m:$Header$ | |
285 | file_text+m:$Header$$Header$Header$ |
|
285 | file_text+m:$Header$$Header$Header$ | |
286 | file_text+s:$Header$ |
|
286 | file_text+s:$Header$ | |
287 | file_text+s:$Header$$Header$Header$ |
|
287 | file_text+s:$Header$$Header$Header$ | |
288 | file_text+s2:$Header$ |
|
288 | file_text+s2:$Header$ | |
289 | file_text+s2:$Header$$Header$Header$ |
|
289 | file_text+s2:$Header$$Header$Header$ | |
290 | file_text+w:$Header$ |
|
290 | file_text+w:$Header$ | |
291 | file_text+w:$Header$$Header$Header$ |
|
291 | file_text+w:$Header$$Header$Header$ | |
292 | file_text+x:$Header$ |
|
292 | file_text+x:$Header$ | |
293 | file_text+x:$Header$$Header$Header$ |
|
293 | file_text+x:$Header$$Header$Header$ | |
294 | file_ubinary:$Header$ |
|
294 | file_ubinary:$Header$ | |
295 | file_ubinary:$Header$$Header$Header$ |
|
295 | file_ubinary:$Header$$Header$Header$ | |
296 | file_uxbinary:$Header$ |
|
296 | file_uxbinary:$Header$ | |
297 | file_uxbinary:$Header$$Header$Header$ |
|
297 | file_uxbinary:$Header$$Header$Header$ | |
298 | file_xbinary:$Header$ |
|
298 | file_xbinary:$Header$ | |
299 | file_xbinary:$Header$$Header$Header$ |
|
299 | file_xbinary:$Header$$Header$Header$ | |
300 | file_xltext:$Header$ |
|
300 | file_xltext:$Header$ | |
301 | file_xltext:$Header$$Header$Header$ |
|
301 | file_xltext:$Header$$Header$Header$ | |
302 | file_xtempobj:$Header$ |
|
302 | file_xtempobj:$Header$ | |
303 | file_xtempobj:$Header$$Header$Header$ |
|
303 | file_xtempobj:$Header$$Header$Header$ | |
304 | file_xtext:$Header$ |
|
304 | file_xtext:$Header$ | |
305 | file_xtext:$Header$$Header$Header$ |
|
305 | file_xtext:$Header$$Header$Header$ | |
306 |
|
306 | |||
307 | convert |
|
307 | convert | |
308 | $ hg convert -s p4 $DEPOTPATH dst |
|
308 | $ hg convert -s p4 $DEPOTPATH dst | |
309 | initializing destination dst repository |
|
309 | initializing destination dst repository | |
310 | scanning source... |
|
310 | scanning source... | |
311 | reading p4 views |
|
311 | reading p4 views | |
312 | collecting p4 changelists |
|
312 | collecting p4 changelists | |
313 | 1 initial |
|
313 | 1 initial | |
314 | 2 keywords |
|
314 | 2 keywords | |
315 | sorting... |
|
315 | sorting... | |
316 | converting... |
|
316 | converting... | |
317 | 1 initial |
|
317 | 1 initial | |
318 | 0 keywords |
|
318 | 0 keywords | |
319 | $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n' |
|
319 | $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n' | |
320 | rev=1 desc="keywords" tags="tip" files="crazy_symlink+k file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_tempobj file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtempobj file_xtext target_symlink target_symlink+k" |
|
320 | rev=1 desc="keywords" tags="tip" files="crazy_symlink+k file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_tempobj file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtempobj file_xtext target_symlink target_symlink+k" | |
321 | rev=0 desc="initial" tags="" files="file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_symlink file_symlink+k file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtext target_symlink target_symlink+k" |
|
321 | rev=0 desc="initial" tags="" files="file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_symlink file_symlink+k file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtext target_symlink target_symlink+k" | |
322 |
|
322 | |||
323 | revision 0 |
|
323 | revision 0 | |
324 | $ hg -R dst update 0 |
|
324 | $ hg -R dst update 0 | |
325 | 30 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
325 | 30 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
326 | $ head dst/file_* | cat -v |
|
326 | $ head dst/file_* | cat -v | |
327 | ==> dst/file_binary <== |
|
327 | ==> dst/file_binary <== | |
328 | this is binary |
|
328 | this is binary | |
329 | ==> dst/file_binary+k <== |
|
329 | ==> dst/file_binary+k <== | |
330 | this is binary+k |
|
330 | this is binary+k | |
331 | ==> dst/file_binary+kx <== |
|
331 | ==> dst/file_binary+kx <== | |
332 | this is binary+kx |
|
332 | this is binary+kx | |
333 | ==> dst/file_binary+x <== |
|
333 | ==> dst/file_binary+x <== | |
334 | this is binary+x |
|
334 | this is binary+x | |
335 | ==> dst/file_ctext <== |
|
335 | ==> dst/file_ctext <== | |
336 | this is ctext |
|
336 | this is ctext | |
337 |
|
337 | |||
338 | ==> dst/file_cxtext <== |
|
338 | ==> dst/file_cxtext <== | |
339 | this is cxtext |
|
339 | this is cxtext | |
340 |
|
340 | |||
341 | ==> dst/file_ktext <== |
|
341 | ==> dst/file_ktext <== | |
342 | this is ktext |
|
342 | this is ktext | |
343 |
|
343 | |||
344 | ==> dst/file_kxtext <== |
|
344 | ==> dst/file_kxtext <== | |
345 | this is kxtext |
|
345 | this is kxtext | |
346 |
|
346 | |||
347 | ==> dst/file_ltext <== |
|
347 | ==> dst/file_ltext <== | |
348 | this is ltext |
|
348 | this is ltext | |
349 |
|
349 | |||
350 | ==> dst/file_symlink <== |
|
350 | ==> dst/file_symlink <== | |
351 | this is target symlink |
|
351 | this is target symlink | |
352 |
|
352 | |||
353 | ==> dst/file_symlink+k <== |
|
353 | ==> dst/file_symlink+k <== | |
354 | this is target symlink+k |
|
354 | this is target symlink+k | |
355 |
|
355 | |||
356 | ==> dst/file_text <== |
|
356 | ==> dst/file_text <== | |
357 | this is text |
|
357 | this is text | |
358 |
|
358 | |||
359 | ==> dst/file_text+c <== |
|
359 | ==> dst/file_text+c <== | |
360 | this is text+C |
|
360 | this is text+C | |
361 |
|
361 | |||
362 | ==> dst/file_text+d <== |
|
362 | ==> dst/file_text+d <== | |
363 | this is text+D |
|
363 | this is text+D | |
364 |
|
364 | |||
365 | ==> dst/file_text+f <== |
|
365 | ==> dst/file_text+f <== | |
366 | this is text+F |
|
366 | this is text+F | |
367 |
|
367 | |||
368 | ==> dst/file_text+k <== |
|
368 | ==> dst/file_text+k <== | |
369 | this is text+k |
|
369 | this is text+k | |
370 |
|
370 | |||
371 | ==> dst/file_text+ko <== |
|
371 | ==> dst/file_text+ko <== | |
372 | this is text+ko |
|
372 | this is text+ko | |
373 |
|
373 | |||
374 | ==> dst/file_text+kx <== |
|
374 | ==> dst/file_text+kx <== | |
375 | this is text+kx |
|
375 | this is text+kx | |
376 |
|
376 | |||
377 | ==> dst/file_text+l <== |
|
377 | ==> dst/file_text+l <== | |
378 | this is text+l |
|
378 | this is text+l | |
379 |
|
379 | |||
380 | ==> dst/file_text+m <== |
|
380 | ==> dst/file_text+m <== | |
381 | this is text+m |
|
381 | this is text+m | |
382 |
|
382 | |||
383 | ==> dst/file_text+s2 <== |
|
383 | ==> dst/file_text+s2 <== | |
384 | this is text+S2 |
|
384 | this is text+S2 | |
385 |
|
385 | |||
386 | ==> dst/file_text+w <== |
|
386 | ==> dst/file_text+w <== | |
387 | this is text+w |
|
387 | this is text+w | |
388 |
|
388 | |||
389 | ==> dst/file_text+x <== |
|
389 | ==> dst/file_text+x <== | |
390 | this is text+x |
|
390 | this is text+x | |
391 |
|
391 | |||
392 | ==> dst/file_ubinary <== |
|
392 | ==> dst/file_ubinary <== | |
393 | this is ubinary |
|
393 | this is ubinary | |
394 |
|
394 | |||
395 | ==> dst/file_uxbinary <== |
|
395 | ==> dst/file_uxbinary <== | |
396 | this is uxbinary |
|
396 | this is uxbinary | |
397 |
|
397 | |||
398 | ==> dst/file_xbinary <== |
|
398 | ==> dst/file_xbinary <== | |
399 | this is xbinary |
|
399 | this is xbinary | |
400 |
|
400 | |||
401 | ==> dst/file_xltext <== |
|
401 | ==> dst/file_xltext <== | |
402 | this is xltext |
|
402 | this is xltext | |
403 |
|
403 | |||
404 | ==> dst/file_xtext <== |
|
404 | ==> dst/file_xtext <== | |
405 | this is xtext |
|
405 | this is xtext | |
406 |
|
406 | |||
407 | revision 1 |
|
407 | revision 1 | |
408 | $ hg -R dst update 1 |
|
408 | $ hg -R dst update 1 | |
409 | 32 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
409 | 32 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
410 | $ head dst/file_* | cat -v |
|
410 | $ head dst/file_* | cat -v | |
411 | ==> dst/file_binary <== |
|
411 | ==> dst/file_binary <== | |
412 | this is binary$Id$ |
|
412 | this is binary$Id$ | |
413 | $Header$ |
|
413 | $Header$ | |
414 | $Date$ |
|
414 | $Date$ | |
415 | $DateTime$ |
|
415 | $DateTime$ | |
416 | $Change$ |
|
416 | $Change$ | |
417 | $File$ |
|
417 | $File$ | |
418 | $Revision$ |
|
418 | $Revision$ | |
419 | $Header$$Header$Header$ |
|
419 | $Header$$Header$Header$ | |
420 |
|
420 | |||
421 | ==> dst/file_binary+k <== |
|
421 | ==> dst/file_binary+k <== | |
422 | this is binary+k$Id$ |
|
422 | this is binary+k$Id$ | |
423 | $Header$ |
|
423 | $Header$ | |
424 | $Date$ |
|
424 | $Date$ | |
425 | $DateTime$ |
|
425 | $DateTime$ | |
426 | $Change$ |
|
426 | $Change$ | |
427 | $File$ |
|
427 | $File$ | |
428 | $Revision$ |
|
428 | $Revision$ | |
429 | $Header$$Header$Header$ |
|
429 | $Header$$Header$Header$ | |
430 |
|
430 | |||
431 | ==> dst/file_binary+kx <== |
|
431 | ==> dst/file_binary+kx <== | |
432 | this is binary+kx$Id$ |
|
432 | this is binary+kx$Id$ | |
433 | $Header$ |
|
433 | $Header$ | |
434 | $Date$ |
|
434 | $Date$ | |
435 | $DateTime$ |
|
435 | $DateTime$ | |
436 | $Change$ |
|
436 | $Change$ | |
437 | $File$ |
|
437 | $File$ | |
438 | $Revision$ |
|
438 | $Revision$ | |
439 | $Header$$Header$Header$ |
|
439 | $Header$$Header$Header$ | |
440 |
|
440 | |||
441 | ==> dst/file_binary+x <== |
|
441 | ==> dst/file_binary+x <== | |
442 | this is binary+x$Id$ |
|
442 | this is binary+x$Id$ | |
443 | $Header$ |
|
443 | $Header$ | |
444 | $Date$ |
|
444 | $Date$ | |
445 | $DateTime$ |
|
445 | $DateTime$ | |
446 | $Change$ |
|
446 | $Change$ | |
447 | $File$ |
|
447 | $File$ | |
448 | $Revision$ |
|
448 | $Revision$ | |
449 | $Header$$Header$Header$ |
|
449 | $Header$$Header$Header$ | |
450 |
|
450 | |||
451 | ==> dst/file_ctext <== |
|
451 | ==> dst/file_ctext <== | |
452 | this is ctext |
|
452 | this is ctext | |
453 | $Id$ |
|
453 | $Id$ | |
454 | $Header$ |
|
454 | $Header$ | |
455 | $Date$ |
|
455 | $Date$ | |
456 | $DateTime$ |
|
456 | $DateTime$ | |
457 | $Change$ |
|
457 | $Change$ | |
458 | $File$ |
|
458 | $File$ | |
459 | $Revision$ |
|
459 | $Revision$ | |
460 | $Header$$Header$Header$ |
|
460 | $Header$$Header$Header$ | |
461 |
|
461 | |||
462 | ==> dst/file_cxtext <== |
|
462 | ==> dst/file_cxtext <== | |
463 | this is cxtext |
|
463 | this is cxtext | |
464 | $Id$ |
|
464 | $Id$ | |
465 | $Header$ |
|
465 | $Header$ | |
466 | $Date$ |
|
466 | $Date$ | |
467 | $DateTime$ |
|
467 | $DateTime$ | |
468 | $Change$ |
|
468 | $Change$ | |
469 | $File$ |
|
469 | $File$ | |
470 | $Revision$ |
|
470 | $Revision$ | |
471 | $Header$$Header$Header$ |
|
471 | $Header$$Header$Header$ | |
472 |
|
472 | |||
473 | ==> dst/file_ktext <== |
|
473 | ==> dst/file_ktext <== | |
474 | this is ktext |
|
474 | this is ktext | |
475 | $Id$ |
|
475 | $Id$ | |
476 | $Header$ |
|
476 | $Header$ | |
477 | $Date$ |
|
477 | $Date$ | |
478 | $DateTime$ |
|
478 | $DateTime$ | |
479 | $Change$ |
|
479 | $Change$ | |
480 | $File$ |
|
480 | $File$ | |
481 | $Revision$ |
|
481 | $Revision$ | |
482 | $Header$$Header$Header$ |
|
482 | $Header$$Header$Header$ | |
483 |
|
483 | |||
484 | ==> dst/file_kxtext <== |
|
484 | ==> dst/file_kxtext <== | |
485 | this is kxtext |
|
485 | this is kxtext | |
486 | $Id$ |
|
486 | $Id$ | |
487 | $Header$ |
|
487 | $Header$ | |
488 | $Date$ |
|
488 | $Date$ | |
489 | $DateTime$ |
|
489 | $DateTime$ | |
490 | $Change$ |
|
490 | $Change$ | |
491 | $File$ |
|
491 | $File$ | |
492 | $Revision$ |
|
492 | $Revision$ | |
493 | $Header$$Header$Header$ |
|
493 | $Header$$Header$Header$ | |
494 |
|
494 | |||
495 | ==> dst/file_ltext <== |
|
495 | ==> dst/file_ltext <== | |
496 | this is ltext |
|
496 | this is ltext | |
497 | $Id$ |
|
497 | $Id$ | |
498 | $Header$ |
|
498 | $Header$ | |
499 | $Date$ |
|
499 | $Date$ | |
500 | $DateTime$ |
|
500 | $DateTime$ | |
501 | $Change$ |
|
501 | $Change$ | |
502 | $File$ |
|
502 | $File$ | |
503 | $Revision$ |
|
503 | $Revision$ | |
504 | $Header$$Header$Header$ |
|
504 | $Header$$Header$Header$ | |
505 |
|
505 | |||
506 | ==> dst/file_symlink <== |
|
506 | ==> dst/file_symlink <== | |
507 | this is target symlink |
|
507 | this is target symlink | |
508 | $Id$ |
|
508 | $Id$ | |
509 | $Header$ |
|
509 | $Header$ | |
510 | $Date$ |
|
510 | $Date$ | |
511 | $DateTime$ |
|
511 | $DateTime$ | |
512 | $Change$ |
|
512 | $Change$ | |
513 | $File$ |
|
513 | $File$ | |
514 | $Revision$ |
|
514 | $Revision$ | |
515 | $Header$$Header$Header$ |
|
515 | $Header$$Header$Header$ | |
516 |
|
516 | |||
517 | ==> dst/file_symlink+k <== |
|
517 | ==> dst/file_symlink+k <== | |
518 | this is target symlink+k |
|
518 | this is target symlink+k | |
519 | $Id$ |
|
519 | $Id$ | |
520 | $Header$ |
|
520 | $Header$ | |
521 | $Date$ |
|
521 | $Date$ | |
522 | $DateTime$ |
|
522 | $DateTime$ | |
523 | $Change$ |
|
523 | $Change$ | |
524 | $File$ |
|
524 | $File$ | |
525 | $Revision$ |
|
525 | $Revision$ | |
526 | $Header$$Header$Header$ |
|
526 | $Header$$Header$Header$ | |
527 |
|
527 | |||
528 | ==> dst/file_tempobj <== |
|
528 | ==> dst/file_tempobj <== | |
529 | this is tempobj |
|
529 | this is tempobj | |
530 | $Id$ |
|
530 | $Id$ | |
531 | $Header$ |
|
531 | $Header$ | |
532 | $Date$ |
|
532 | $Date$ | |
533 | $DateTime$ |
|
533 | $DateTime$ | |
534 | $Change$ |
|
534 | $Change$ | |
535 | $File$ |
|
535 | $File$ | |
536 | $Revision$ |
|
536 | $Revision$ | |
537 | $Header$$Header$Header$ |
|
537 | $Header$$Header$Header$ | |
538 |
|
538 | |||
539 | ==> dst/file_text <== |
|
539 | ==> dst/file_text <== | |
540 | this is text |
|
540 | this is text | |
541 | $Id$ |
|
541 | $Id$ | |
542 | $Header$ |
|
542 | $Header$ | |
543 | $Date$ |
|
543 | $Date$ | |
544 | $DateTime$ |
|
544 | $DateTime$ | |
545 | $Change$ |
|
545 | $Change$ | |
546 | $File$ |
|
546 | $File$ | |
547 | $Revision$ |
|
547 | $Revision$ | |
548 | $Header$$Header$Header$ |
|
548 | $Header$$Header$Header$ | |
549 |
|
549 | |||
550 | ==> dst/file_text+c <== |
|
550 | ==> dst/file_text+c <== | |
551 | this is text+C |
|
551 | this is text+C | |
552 | $Id$ |
|
552 | $Id$ | |
553 | $Header$ |
|
553 | $Header$ | |
554 | $Date$ |
|
554 | $Date$ | |
555 | $DateTime$ |
|
555 | $DateTime$ | |
556 | $Change$ |
|
556 | $Change$ | |
557 | $File$ |
|
557 | $File$ | |
558 | $Revision$ |
|
558 | $Revision$ | |
559 | $Header$$Header$Header$ |
|
559 | $Header$$Header$Header$ | |
560 |
|
560 | |||
561 | ==> dst/file_text+d <== |
|
561 | ==> dst/file_text+d <== | |
562 | this is text+D |
|
562 | this is text+D | |
563 | $Id$ |
|
563 | $Id$ | |
564 | $Header$ |
|
564 | $Header$ | |
565 | $Date$ |
|
565 | $Date$ | |
566 | $DateTime$ |
|
566 | $DateTime$ | |
567 | $Change$ |
|
567 | $Change$ | |
568 | $File$ |
|
568 | $File$ | |
569 | $Revision$ |
|
569 | $Revision$ | |
570 | $Header$$Header$Header$ |
|
570 | $Header$$Header$Header$ | |
571 |
|
571 | |||
572 | ==> dst/file_text+f <== |
|
572 | ==> dst/file_text+f <== | |
573 | this is text+F |
|
573 | this is text+F | |
574 | $Id$ |
|
574 | $Id$ | |
575 | $Header$ |
|
575 | $Header$ | |
576 | $Date$ |
|
576 | $Date$ | |
577 | $DateTime$ |
|
577 | $DateTime$ | |
578 | $Change$ |
|
578 | $Change$ | |
579 | $File$ |
|
579 | $File$ | |
580 | $Revision$ |
|
580 | $Revision$ | |
581 | $Header$$Header$Header$ |
|
581 | $Header$$Header$Header$ | |
582 |
|
582 | |||
583 | ==> dst/file_text+k <== |
|
583 | ==> dst/file_text+k <== | |
584 | this is text+k |
|
584 | this is text+k | |
585 | $Id$ |
|
585 | $Id$ | |
586 | $Header$ |
|
586 | $Header$ | |
587 | $Date$ |
|
587 | $Date$ | |
588 | $DateTime$ |
|
588 | $DateTime$ | |
589 | $Change$ |
|
589 | $Change$ | |
590 | $File$ |
|
590 | $File$ | |
591 | $Revision$ |
|
591 | $Revision$ | |
592 | $Header$$Header$Header$ |
|
592 | $Header$$Header$Header$ | |
593 |
|
593 | |||
594 | ==> dst/file_text+ko <== |
|
594 | ==> dst/file_text+ko <== | |
595 | this is text+ko |
|
595 | this is text+ko | |
596 | $Id$ |
|
596 | $Id$ | |
597 | $Header$ |
|
597 | $Header$ | |
598 | $Date$ |
|
598 | $Date$ | |
599 | $DateTime$ |
|
599 | $DateTime$ | |
600 | $Change$ |
|
600 | $Change$ | |
601 | $File$ |
|
601 | $File$ | |
602 | $Revision$ |
|
602 | $Revision$ | |
603 | $Header$$Header$Header$ |
|
603 | $Header$$Header$Header$ | |
604 |
|
604 | |||
605 | ==> dst/file_text+kx <== |
|
605 | ==> dst/file_text+kx <== | |
606 | this is text+kx |
|
606 | this is text+kx | |
607 | $Id$ |
|
607 | $Id$ | |
608 | $Header$ |
|
608 | $Header$ | |
609 | $Date$ |
|
609 | $Date$ | |
610 | $DateTime$ |
|
610 | $DateTime$ | |
611 | $Change$ |
|
611 | $Change$ | |
612 | $File$ |
|
612 | $File$ | |
613 | $Revision$ |
|
613 | $Revision$ | |
614 | $Header$$Header$Header$ |
|
614 | $Header$$Header$Header$ | |
615 |
|
615 | |||
616 | ==> dst/file_text+l <== |
|
616 | ==> dst/file_text+l <== | |
617 | this is text+l |
|
617 | this is text+l | |
618 | $Id$ |
|
618 | $Id$ | |
619 | $Header$ |
|
619 | $Header$ | |
620 | $Date$ |
|
620 | $Date$ | |
621 | $DateTime$ |
|
621 | $DateTime$ | |
622 | $Change$ |
|
622 | $Change$ | |
623 | $File$ |
|
623 | $File$ | |
624 | $Revision$ |
|
624 | $Revision$ | |
625 | $Header$$Header$Header$ |
|
625 | $Header$$Header$Header$ | |
626 |
|
626 | |||
627 | ==> dst/file_text+m <== |
|
627 | ==> dst/file_text+m <== | |
628 | this is text+m |
|
628 | this is text+m | |
629 | $Id$ |
|
629 | $Id$ | |
630 | $Header$ |
|
630 | $Header$ | |
631 | $Date$ |
|
631 | $Date$ | |
632 | $DateTime$ |
|
632 | $DateTime$ | |
633 | $Change$ |
|
633 | $Change$ | |
634 | $File$ |
|
634 | $File$ | |
635 | $Revision$ |
|
635 | $Revision$ | |
636 | $Header$$Header$Header$ |
|
636 | $Header$$Header$Header$ | |
637 |
|
637 | |||
638 | ==> dst/file_text+s <== |
|
638 | ==> dst/file_text+s <== | |
639 | this is text+S |
|
639 | this is text+S | |
640 | $Id$ |
|
640 | $Id$ | |
641 | $Header$ |
|
641 | $Header$ | |
642 | $Date$ |
|
642 | $Date$ | |
643 | $DateTime$ |
|
643 | $DateTime$ | |
644 | $Change$ |
|
644 | $Change$ | |
645 | $File$ |
|
645 | $File$ | |
646 | $Revision$ |
|
646 | $Revision$ | |
647 | $Header$$Header$Header$ |
|
647 | $Header$$Header$Header$ | |
648 |
|
648 | |||
649 | ==> dst/file_text+s2 <== |
|
649 | ==> dst/file_text+s2 <== | |
650 | this is text+S2 |
|
650 | this is text+S2 | |
651 | $Id$ |
|
651 | $Id$ | |
652 | $Header$ |
|
652 | $Header$ | |
653 | $Date$ |
|
653 | $Date$ | |
654 | $DateTime$ |
|
654 | $DateTime$ | |
655 | $Change$ |
|
655 | $Change$ | |
656 | $File$ |
|
656 | $File$ | |
657 | $Revision$ |
|
657 | $Revision$ | |
658 | $Header$$Header$Header$ |
|
658 | $Header$$Header$Header$ | |
659 |
|
659 | |||
660 | ==> dst/file_text+w <== |
|
660 | ==> dst/file_text+w <== | |
661 | this is text+w |
|
661 | this is text+w | |
662 | $Id$ |
|
662 | $Id$ | |
663 | $Header$ |
|
663 | $Header$ | |
664 | $Date$ |
|
664 | $Date$ | |
665 | $DateTime$ |
|
665 | $DateTime$ | |
666 | $Change$ |
|
666 | $Change$ | |
667 | $File$ |
|
667 | $File$ | |
668 | $Revision$ |
|
668 | $Revision$ | |
669 | $Header$$Header$Header$ |
|
669 | $Header$$Header$Header$ | |
670 |
|
670 | |||
671 | ==> dst/file_text+x <== |
|
671 | ==> dst/file_text+x <== | |
672 | this is text+x |
|
672 | this is text+x | |
673 | $Id$ |
|
673 | $Id$ | |
674 | $Header$ |
|
674 | $Header$ | |
675 | $Date$ |
|
675 | $Date$ | |
676 | $DateTime$ |
|
676 | $DateTime$ | |
677 | $Change$ |
|
677 | $Change$ | |
678 | $File$ |
|
678 | $File$ | |
679 | $Revision$ |
|
679 | $Revision$ | |
680 | $Header$$Header$Header$ |
|
680 | $Header$$Header$Header$ | |
681 |
|
681 | |||
682 | ==> dst/file_ubinary <== |
|
682 | ==> dst/file_ubinary <== | |
683 | this is ubinary |
|
683 | this is ubinary | |
684 | $Id$ |
|
684 | $Id$ | |
685 | $Header$ |
|
685 | $Header$ | |
686 | $Date$ |
|
686 | $Date$ | |
687 | $DateTime$ |
|
687 | $DateTime$ | |
688 | $Change$ |
|
688 | $Change$ | |
689 | $File$ |
|
689 | $File$ | |
690 | $Revision$ |
|
690 | $Revision$ | |
691 | $Header$$Header$Header$ |
|
691 | $Header$$Header$Header$ | |
692 |
|
692 | |||
693 | ==> dst/file_uxbinary <== |
|
693 | ==> dst/file_uxbinary <== | |
694 | this is uxbinary |
|
694 | this is uxbinary | |
695 | $Id$ |
|
695 | $Id$ | |
696 | $Header$ |
|
696 | $Header$ | |
697 | $Date$ |
|
697 | $Date$ | |
698 | $DateTime$ |
|
698 | $DateTime$ | |
699 | $Change$ |
|
699 | $Change$ | |
700 | $File$ |
|
700 | $File$ | |
701 | $Revision$ |
|
701 | $Revision$ | |
702 | $Header$$Header$Header$ |
|
702 | $Header$$Header$Header$ | |
703 |
|
703 | |||
704 | ==> dst/file_xbinary <== |
|
704 | ==> dst/file_xbinary <== | |
705 | this is xbinary |
|
705 | this is xbinary | |
706 | $Id$ |
|
706 | $Id$ | |
707 | $Header$ |
|
707 | $Header$ | |
708 | $Date$ |
|
708 | $Date$ | |
709 | $DateTime$ |
|
709 | $DateTime$ | |
710 | $Change$ |
|
710 | $Change$ | |
711 | $File$ |
|
711 | $File$ | |
712 | $Revision$ |
|
712 | $Revision$ | |
713 | $Header$$Header$Header$ |
|
713 | $Header$$Header$Header$ | |
714 |
|
714 | |||
715 | ==> dst/file_xltext <== |
|
715 | ==> dst/file_xltext <== | |
716 | this is xltext |
|
716 | this is xltext | |
717 | $Id$ |
|
717 | $Id$ | |
718 | $Header$ |
|
718 | $Header$ | |
719 | $Date$ |
|
719 | $Date$ | |
720 | $DateTime$ |
|
720 | $DateTime$ | |
721 | $Change$ |
|
721 | $Change$ | |
722 | $File$ |
|
722 | $File$ | |
723 | $Revision$ |
|
723 | $Revision$ | |
724 | $Header$$Header$Header$ |
|
724 | $Header$$Header$Header$ | |
725 |
|
725 | |||
726 | ==> dst/file_xtempobj <== |
|
726 | ==> dst/file_xtempobj <== | |
727 | this is xtempobj |
|
727 | this is xtempobj | |
728 | $Id$ |
|
728 | $Id$ | |
729 | $Header$ |
|
729 | $Header$ | |
730 | $Date$ |
|
730 | $Date$ | |
731 | $DateTime$ |
|
731 | $DateTime$ | |
732 | $Change$ |
|
732 | $Change$ | |
733 | $File$ |
|
733 | $File$ | |
734 | $Revision$ |
|
734 | $Revision$ | |
735 | $Header$$Header$Header$ |
|
735 | $Header$$Header$Header$ | |
736 |
|
736 | |||
737 | ==> dst/file_xtext <== |
|
737 | ==> dst/file_xtext <== | |
738 | this is xtext |
|
738 | this is xtext | |
739 | $Id$ |
|
739 | $Id$ | |
740 | $Header$ |
|
740 | $Header$ | |
741 | $Date$ |
|
741 | $Date$ | |
742 | $DateTime$ |
|
742 | $DateTime$ | |
743 | $Change$ |
|
743 | $Change$ | |
744 | $File$ |
|
744 | $File$ | |
745 | $Revision$ |
|
745 | $Revision$ | |
746 | $Header$$Header$Header$ |
|
746 | $Header$$Header$Header$ | |
747 |
|
747 | |||
748 | crazy_symlink |
|
748 | crazy_symlink | |
749 | $ readlink.py crazy_symlink+k |
|
749 | $ readlink.py crazy_symlink+k | |
750 | crazy_symlink+k -> target_$Header: //depot/test-mercurial-import/crazy_symlink+k#1 $ |
|
750 | crazy_symlink+k -> target_$Header: //depot/test-mercurial-import/crazy_symlink+k#1 $ | |
751 | $ readlink.py dst/crazy_symlink+k |
|
751 | $ readlink.py dst/crazy_symlink+k | |
752 | dst/crazy_symlink+k -> target_$Header$ |
|
752 | dst/crazy_symlink+k -> target_$Header$ | |
753 |
|
753 | |||
754 | exit trap: |
|
754 | exit trap: | |
755 | stopping the p4 server |
|
755 | stopping the p4 server |
General Comments 0
You need to be logged in to leave comments.
Login now