16 |
25 |
17 $ hg init sub1 |
26 $ hg init sub1 |
18 $ echo sub1 > sub1/sub1 |
27 $ echo sub1 > sub1/sub1 |
19 $ echo "sub2 = ../sub2" > sub1/.hgsub |
28 $ echo "sub2 = ../sub2" > sub1/.hgsub |
20 $ hg clone sub2 sub1/sub2 |
29 $ hg clone sub2 sub1/sub2 |
|
30 \r (no-eol) (esc) |
|
31 linking [ <=> ] 1\r (no-eol) (esc) |
|
32 linking [ <=> ] 2\r (no-eol) (esc) |
|
33 linking [ <=> ] 3\r (no-eol) (esc) |
|
34 linking [ <=> ] 4\r (no-eol) (esc) |
|
35 linking [ <=> ] 5\r (no-eol) (esc) |
|
36 linking [ <=> ] 6\r (no-eol) (esc) |
|
37 \r (no-eol) (esc) |
|
38 \r (no-eol) (esc) |
|
39 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
40 \r (no-eol) (esc) |
21 updating to branch default |
41 updating to branch default |
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23 $ hg add -R sub1 |
43 $ hg add -R sub1 |
24 adding sub1/.hgsub (glob) |
44 adding sub1/.hgsub (glob) |
25 adding sub1/sub1 (glob) |
45 adding sub1/sub1 (glob) |
29 |
49 |
30 $ hg init main |
50 $ hg init main |
31 $ echo main > main/main |
51 $ echo main > main/main |
32 $ echo "sub1 = ../sub1" > main/.hgsub |
52 $ echo "sub1 = ../sub1" > main/.hgsub |
33 $ hg clone sub1 main/sub1 |
53 $ hg clone sub1 main/sub1 |
|
54 \r (no-eol) (esc) |
|
55 linking [ <=> ] 1\r (no-eol) (esc) |
|
56 linking [ <=> ] 2\r (no-eol) (esc) |
|
57 linking [ <=> ] 3\r (no-eol) (esc) |
|
58 linking [ <=> ] 4\r (no-eol) (esc) |
|
59 linking [ <=> ] 5\r (no-eol) (esc) |
|
60 linking [ <=> ] 6\r (no-eol) (esc) |
|
61 linking [ <=> ] 7\r (no-eol) (esc) |
|
62 linking [ <=> ] 8\r (no-eol) (esc) |
|
63 \r (no-eol) (esc) |
|
64 \r (no-eol) (esc) |
|
65 updating [===========================================>] 3/3\r (no-eol) (esc) |
|
66 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
67 \r (no-eol) (esc) |
34 updating to branch default |
68 updating to branch default |
35 cloning subrepo sub2 from $TESTTMP/sub2 |
69 cloning subrepo sub2 from $TESTTMP/sub2 |
36 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
70 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
37 $ hg add -R main |
71 $ hg add -R main |
38 adding main/.hgsub (glob) |
72 adding main/.hgsub (glob) |
40 $ hg commit -R main -m "main import" |
74 $ hg commit -R main -m "main import" |
41 |
75 |
42 Cleaning both repositories, just as a clone -U |
76 Cleaning both repositories, just as a clone -U |
43 |
77 |
44 $ hg up -C -R sub2 null |
78 $ hg up -C -R sub2 null |
|
79 \r (no-eol) (esc) |
|
80 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
81 \r (no-eol) (esc) |
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46 $ hg up -C -R sub1 null |
83 $ hg up -C -R sub1 null |
|
84 \r (no-eol) (esc) |
|
85 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
86 \r (no-eol) (esc) |
|
87 \r (no-eol) (esc) |
|
88 updating [===========================================>] 3/3\r (no-eol) (esc) |
|
89 \r (no-eol) (esc) |
47 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
90 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
48 $ hg up -C -R main null |
91 $ hg up -C -R main null |
|
92 \r (no-eol) (esc) |
|
93 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
94 \r (no-eol) (esc) |
|
95 \r (no-eol) (esc) |
|
96 updating [===========================================>] 3/3\r (no-eol) (esc) |
|
97 \r (no-eol) (esc) |
|
98 \r (no-eol) (esc) |
|
99 updating [===========================================>] 3/3\r (no-eol) (esc) |
|
100 \r (no-eol) (esc) |
49 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
101 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
50 $ rm -rf main/sub1 |
102 $ rm -rf main/sub1 |
51 $ rm -rf sub1/sub2 |
103 $ rm -rf sub1/sub2 |
52 |
104 |
53 Clone main |
105 Clone main |
54 |
106 |
55 $ hg --config extensions.largefiles= clone main cloned |
107 $ hg --config extensions.largefiles= clone main cloned |
|
108 \r (no-eol) (esc) |
|
109 linking [ <=> ] 1\r (no-eol) (esc) |
|
110 linking [ <=> ] 2\r (no-eol) (esc) |
|
111 linking [ <=> ] 3\r (no-eol) (esc) |
|
112 linking [ <=> ] 4\r (no-eol) (esc) |
|
113 linking [ <=> ] 5\r (no-eol) (esc) |
|
114 linking [ <=> ] 6\r (no-eol) (esc) |
|
115 linking [ <=> ] 7\r (no-eol) (esc) |
|
116 linking [ <=> ] 8\r (no-eol) (esc) |
|
117 \r (no-eol) (esc) |
|
118 \r (no-eol) (esc) |
|
119 updating [===========================================>] 3/3\r (no-eol) (esc) |
|
120 updating [===========================================>] 3/3\r (no-eol) (esc) |
|
121 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
122 \r (no-eol) (esc) |
56 updating to branch default |
123 updating to branch default |
57 cloning subrepo sub1 from $TESTTMP/sub1 |
124 cloning subrepo sub1 from $TESTTMP/sub1 |
58 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob) |
125 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob) |
59 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
126 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
60 |
127 |
176 R sub1/sub2/test.txt |
246 R sub1/sub2/test.txt |
177 |
247 |
178 Archive wdir() with subrepos |
248 Archive wdir() with subrepos |
179 $ hg rm main |
249 $ hg rm main |
180 $ hg archive -S -r 'wdir()' ../wdir |
250 $ hg archive -S -r 'wdir()' ../wdir |
|
251 \r (no-eol) (esc) |
|
252 archiving [ ] 0/3\r (no-eol) (esc) |
|
253 archiving [=============> ] 1/3\r (no-eol) (esc) |
|
254 archiving [===========================> ] 2/3\r (no-eol) (esc) |
|
255 archiving [==========================================>] 3/3\r (no-eol) (esc) |
|
256 \r (no-eol) (esc) |
|
257 \r (no-eol) (esc) |
|
258 archiving (sub1) [ ] 0/4\r (no-eol) (esc) |
|
259 archiving (sub1) [========> ] 1/4\r (no-eol) (esc) |
|
260 archiving (sub1) [=================> ] 2/4\r (no-eol) (esc) |
|
261 archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc) |
|
262 archiving (sub1) [===================================>] 4/4\r (no-eol) (esc) |
|
263 \r (no-eol) (esc) |
|
264 \r (no-eol) (esc) |
|
265 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
|
266 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
|
267 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
|
268 \r (no-eol) (esc) |
181 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' |
269 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' |
182 Only in ../wdir: .hg_archival.txt |
270 Only in ../wdir: .hg_archival.txt |
183 |
271 |
184 $ find ../wdir -type f | sort |
272 $ find ../wdir -type f | sort |
185 ../wdir/.hg_archival.txt |
273 ../wdir/.hg_archival.txt |
203 |
291 |
204 Attempting to archive 'wdir()' with a missing file is handled gracefully |
292 Attempting to archive 'wdir()' with a missing file is handled gracefully |
205 $ rm sub1/sub1 |
293 $ rm sub1/sub1 |
206 $ rm -r ../wdir |
294 $ rm -r ../wdir |
207 $ hg archive -v -S -r 'wdir()' ../wdir |
295 $ hg archive -v -S -r 'wdir()' ../wdir |
|
296 \r (no-eol) (esc) |
|
297 archiving [ ] 0/3\r (no-eol) (esc) |
|
298 archiving [=============> ] 1/3\r (no-eol) (esc) |
|
299 archiving [===========================> ] 2/3\r (no-eol) (esc) |
|
300 archiving [==========================================>] 3/3\r (no-eol) (esc) |
|
301 \r (no-eol) (esc) |
|
302 \r (no-eol) (esc) |
|
303 archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
|
304 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
|
305 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
|
306 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
|
307 \r (no-eol) (esc) |
|
308 \r (no-eol) (esc) |
|
309 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
|
310 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
|
311 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
|
312 \r (no-eol) (esc) |
208 $ find ../wdir -type f | sort |
313 $ find ../wdir -type f | sort |
209 ../wdir/.hg_archival.txt |
314 ../wdir/.hg_archival.txt |
210 ../wdir/.hgsub |
315 ../wdir/.hgsub |
211 ../wdir/.hgsubstate |
316 ../wdir/.hgsubstate |
212 ../wdir/foo/bar/abc |
317 ../wdir/foo/bar/abc |
218 |
323 |
219 Continue relative path printing + subrepos |
324 Continue relative path printing + subrepos |
220 $ hg update -Cq |
325 $ hg update -Cq |
221 $ rm -r ../wdir |
326 $ rm -r ../wdir |
222 $ hg archive -S -r 'wdir()' ../wdir |
327 $ hg archive -S -r 'wdir()' ../wdir |
|
328 \r (no-eol) (esc) |
|
329 archiving [ ] 0/3\r (no-eol) (esc) |
|
330 archiving [=============> ] 1/3\r (no-eol) (esc) |
|
331 archiving [===========================> ] 2/3\r (no-eol) (esc) |
|
332 archiving [==========================================>] 3/3\r (no-eol) (esc) |
|
333 \r (no-eol) (esc) |
|
334 \r (no-eol) (esc) |
|
335 archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
|
336 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
|
337 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
|
338 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
|
339 \r (no-eol) (esc) |
|
340 \r (no-eol) (esc) |
|
341 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc) |
|
342 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc) |
|
343 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc) |
|
344 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc) |
|
345 \r (no-eol) (esc) |
223 $ cat ../wdir/.hg_archival.txt |
346 $ cat ../wdir/.hg_archival.txt |
224 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a |
347 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a |
225 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd |
348 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd |
226 branch: default |
349 branch: default |
227 latesttag: null |
350 latesttag: null |
331 |
454 |
332 $ hg rollback -q |
455 $ hg rollback -q |
333 $ hg up -Cq |
456 $ hg up -Cq |
334 |
457 |
335 $ hg --config extensions.largefiles=! archive -S ../archive_all |
458 $ hg --config extensions.largefiles=! archive -S ../archive_all |
|
459 \r (no-eol) (esc) |
|
460 archiving [ ] 0/3\r (no-eol) (esc) |
|
461 archiving [=============> ] 1/3\r (no-eol) (esc) |
|
462 archiving [===========================> ] 2/3\r (no-eol) (esc) |
|
463 archiving [==========================================>] 3/3\r (no-eol) (esc) |
|
464 \r (no-eol) (esc) |
|
465 \r (no-eol) (esc) |
|
466 archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
|
467 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
|
468 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
|
469 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
|
470 \r (no-eol) (esc) |
|
471 \r (no-eol) (esc) |
|
472 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc) |
|
473 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc) |
|
474 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc) |
|
475 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc) |
|
476 \r (no-eol) (esc) |
336 $ find ../archive_all | sort |
477 $ find ../archive_all | sort |
337 ../archive_all |
478 ../archive_all |
338 ../archive_all/.hg_archival.txt |
479 ../archive_all/.hg_archival.txt |
339 ../archive_all/.hgsub |
480 ../archive_all/.hgsub |
340 ../archive_all/.hgsubstate |
481 ../archive_all/.hgsubstate |
350 ../archive_all/sub1/sub2/test.txt |
491 ../archive_all/sub1/sub2/test.txt |
351 |
492 |
352 Check that archive -X works in deep subrepos |
493 Check that archive -X works in deep subrepos |
353 |
494 |
354 $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude |
495 $ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude |
|
496 \r (no-eol) (esc) |
|
497 archiving [ ] 0/3\r (no-eol) (esc) |
|
498 archiving [=============> ] 1/3\r (no-eol) (esc) |
|
499 archiving [===========================> ] 2/3\r (no-eol) (esc) |
|
500 archiving [==========================================>] 3/3\r (no-eol) (esc) |
|
501 \r (no-eol) (esc) |
|
502 \r (no-eol) (esc) |
|
503 archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
|
504 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
|
505 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
|
506 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
|
507 \r (no-eol) (esc) |
|
508 \r (no-eol) (esc) |
|
509 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc) |
|
510 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc) |
|
511 \r (no-eol) (esc) |
355 $ find ../archive_exclude | sort |
512 $ find ../archive_exclude | sort |
356 ../archive_exclude |
513 ../archive_exclude |
357 ../archive_exclude/.hg_archival.txt |
514 ../archive_exclude/.hg_archival.txt |
358 ../archive_exclude/.hgsub |
515 ../archive_exclude/.hgsub |
359 ../archive_exclude/.hgsubstate |
516 ../archive_exclude/.hgsubstate |
364 ../archive_exclude/sub1/sub1 |
521 ../archive_exclude/sub1/sub1 |
365 ../archive_exclude/sub1/sub2 |
522 ../archive_exclude/sub1/sub2 |
366 ../archive_exclude/sub1/sub2/sub2 |
523 ../archive_exclude/sub1/sub2/sub2 |
367 |
524 |
368 $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include |
525 $ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include |
|
526 \r (no-eol) (esc) |
|
527 archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
|
528 \r (no-eol) (esc) |
|
529 \r (no-eol) (esc) |
|
530 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
|
531 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
|
532 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
|
533 \r (no-eol) (esc) |
369 $ find ../archive_include | sort |
534 $ find ../archive_include | sort |
370 ../archive_include |
535 ../archive_include |
371 ../archive_include/sub1 |
536 ../archive_include/sub1 |
372 ../archive_include/sub1/sub2 |
537 ../archive_include/sub1/sub2 |
373 ../archive_include/sub1/sub2/folder |
538 ../archive_include/sub1/sub2/folder |
724 Interaction with extdiff, largefiles and subrepos |
889 Interaction with extdiff, largefiles and subrepos |
725 |
890 |
726 $ hg --config extensions.extdiff= pdiff -S |
891 $ hg --config extensions.extdiff= pdiff -S |
727 |
892 |
728 $ hg --config extensions.extdiff= pdiff -r '.^' -S |
893 $ hg --config extensions.extdiff= pdiff -r '.^' -S |
|
894 \r (no-eol) (esc) |
|
895 archiving [ ] 0/2\r (no-eol) (esc) |
|
896 archiving [====================> ] 1/2\r (no-eol) (esc) |
|
897 archiving [==========================================>] 2/2\r (no-eol) (esc) |
|
898 \r (no-eol) (esc) |
|
899 \r (no-eol) (esc) |
|
900 archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
|
901 \r (no-eol) (esc) |
|
902 \r (no-eol) (esc) |
|
903 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc) |
|
904 \r (no-eol) (esc) |
|
905 \r (no-eol) (esc) |
|
906 archiving (sub3) [ <=> ] 0\r (no-eol) (esc) |
|
907 \r (no-eol) (esc) |
|
908 \r (no-eol) (esc) |
|
909 archiving [ ] 0/2\r (no-eol) (esc) |
|
910 archiving [====================> ] 1/2\r (no-eol) (esc) |
|
911 archiving [==========================================>] 2/2\r (no-eol) (esc) |
|
912 \r (no-eol) (esc) |
|
913 \r (no-eol) (esc) |
|
914 archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
|
915 \r (no-eol) (esc) |
|
916 \r (no-eol) (esc) |
|
917 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc) |
|
918 \r (no-eol) (esc) |
729 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
919 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
730 --- cloned.*/.hgsub * (glob) |
920 --- cloned.*/.hgsub * (glob) |
731 +++ cloned/.hgsub * (glob) |
921 +++ cloned/.hgsub * (glob) |
732 @@ -1,2 +1* @@ (glob) |
922 @@ -1,2 +1* @@ (glob) |
733 sub1 = ../sub1 |
923 sub1 = ../sub1 |
739 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
929 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
740 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
930 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
741 [1] |
931 [1] |
742 |
932 |
743 $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S |
933 $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S |
|
934 \r (no-eol) (esc) |
|
935 archiving [ ] 0/3\r (no-eol) (esc) |
|
936 archiving [=============> ] 1/3\r (no-eol) (esc) |
|
937 archiving [===========================> ] 2/3\r (no-eol) (esc) |
|
938 archiving [==========================================>] 3/3\r (no-eol) (esc) |
|
939 \r (no-eol) (esc) |
|
940 \r (no-eol) (esc) |
|
941 archiving (sub1) [ ] 0/1\r (no-eol) (esc) |
|
942 archiving (sub1) [===================================>] 1/1\r (no-eol) (esc) |
|
943 \r (no-eol) (esc) |
|
944 \r (no-eol) (esc) |
|
945 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc) |
|
946 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc) |
|
947 \r (no-eol) (esc) |
|
948 \r (no-eol) (esc) |
|
949 archiving [ ] 0/8\r (no-eol) (esc) |
|
950 archiving [====> ] 1/8\r (no-eol) (esc) |
|
951 archiving [=========> ] 2/8\r (no-eol) (esc) |
|
952 archiving [===============> ] 3/8\r (no-eol) (esc) |
|
953 archiving [====================> ] 4/8\r (no-eol) (esc) |
|
954 archiving [=========================> ] 5/8\r (no-eol) (esc) |
|
955 archiving [===============================> ] 6/8\r (no-eol) (esc) |
|
956 archiving [====================================> ] 7/8\r (no-eol) (esc) |
|
957 archiving [==========================================>] 8/8\r (no-eol) (esc) |
|
958 \r (no-eol) (esc) |
|
959 \r (no-eol) (esc) |
|
960 archiving (sub1) [ ] 0/1\r (no-eol) (esc) |
|
961 archiving (sub1) [===================================>] 1/1\r (no-eol) (esc) |
|
962 \r (no-eol) (esc) |
|
963 \r (no-eol) (esc) |
|
964 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc) |
|
965 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc) |
|
966 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc) |
|
967 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc) |
|
968 \r (no-eol) (esc) |
|
969 \r (no-eol) (esc) |
|
970 archiving (sub3) [ ] 0/1\r (no-eol) (esc) |
|
971 archiving (sub3) [===================================>] 1/1\r (no-eol) (esc) |
|
972 \r (no-eol) (esc) |
744 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
973 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
745 --- cloned.*/.hglf/b.dat * (glob) |
974 --- cloned.*/.hglf/b.dat * (glob) |
746 +++ cloned.*/.hglf/b.dat * (glob) |
975 +++ cloned.*/.hglf/b.dat * (glob) |
747 @@ -*,0 +1* @@ (glob) |
976 @@ -*,0 +1* @@ (glob) |
748 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
977 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
804 +xyz |
1033 +xyz |
805 [1] |
1034 [1] |
806 |
1035 |
807 $ echo mod > sub1/sub2/sub2 |
1036 $ echo mod > sub1/sub2/sub2 |
808 $ hg --config extensions.extdiff= pdiff -S |
1037 $ hg --config extensions.extdiff= pdiff -S |
|
1038 \r (no-eol) (esc) |
|
1039 archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
|
1040 \r (no-eol) (esc) |
|
1041 \r (no-eol) (esc) |
|
1042 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc) |
|
1043 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc) |
|
1044 \r (no-eol) (esc) |
809 --- */cloned.*/sub1/sub2/sub2 * (glob) |
1045 --- */cloned.*/sub1/sub2/sub2 * (glob) |
810 +++ */cloned/sub1/sub2/sub2 * (glob) |
1046 +++ */cloned/sub1/sub2/sub2 * (glob) |
811 @@ -1* +1* @@ (glob) |
1047 @@ -1* +1* @@ (glob) |
812 -modified |
1048 -modified |
813 +mod |
1049 +mod |