##// END OF EJS Templates
sidedatacopies: introduce a sidedata testcase for test-copies.t...
marmoute -
r43409:f78ad4ca default
parent child Browse files
Show More
@@ -1,4 +1,4 b''
1 #testcases filelog compatibility changeset
1 #testcases filelog compatibility changeset sidedata
2
2
3 $ cat >> $HGRCPATH << EOF
3 $ cat >> $HGRCPATH << EOF
4 > [extensions]
4 > [extensions]
@@ -22,6 +22,13 b''
22 > EOF
22 > EOF
23 #endif
23 #endif
24
24
25 #if sidedata
26 $ cat >> $HGRCPATH << EOF
27 > [format]
28 > exp-use-copies-side-data-changeset = yes
29 > EOF
30 #endif
31
25 $ REPONUM=0
32 $ REPONUM=0
26 $ newrepo() {
33 $ newrepo() {
27 > cd $TESTTMP
34 > cd $TESTTMP
@@ -302,6 +309,7 b" It's a little weird that it shows up on "
302 x -> z
309 x -> z
303 $ hg debugpathcopies 0 2
310 $ hg debugpathcopies 0 2
304 x -> z (filelog !)
311 x -> z (filelog !)
312 x -> z (sidedata !)
305
313
306 Copy file that exists on both sides of the merge, different content
314 Copy file that exists on both sides of the merge, different content
307 $ newrepo
315 $ newrepo
@@ -395,7 +403,7 b' Copy x to y on one side of merge, create'
395 $ hg debugpathcopies 2 3
403 $ hg debugpathcopies 2 3
396 y -> z
404 y -> z
397 $ hg debugpathcopies 1 3
405 $ hg debugpathcopies 1 3
398 y -> z (no-filelog !)
406 y -> z (no-filelog no-sidedata !)
399
407
400 Create x and y, then rename x to z on one side of merge, and rename y to z and
408 Create x and y, then rename x to z on one side of merge, and rename y to z and
401 modify z on the other side. When storing copies in the changeset, we don't
409 modify z on the other side. When storing copies in the changeset, we don't
@@ -440,17 +448,18 b' Try merging the other direction too'
440 o 0 add x and y
448 o 0 add x and y
441 x y
449 x y
442 $ hg debugpathcopies 1 4
450 $ hg debugpathcopies 1 4
443 y -> z (no-filelog !)
451 y -> z (no-filelog no-sidedata !)
444 $ hg debugpathcopies 2 4
452 $ hg debugpathcopies 2 4
445 x -> z (no-filelog !)
453 x -> z (no-filelog no-sidedata !)
446 $ hg debugpathcopies 0 4
454 $ hg debugpathcopies 0 4
447 x -> z (filelog !)
455 x -> z (filelog !)
456 x -> z (sidedata !)
448 y -> z (compatibility !)
457 y -> z (compatibility !)
449 y -> z (changeset !)
458 y -> z (changeset !)
450 $ hg debugpathcopies 1 5
459 $ hg debugpathcopies 1 5
451 y -> z (no-filelog !)
460 y -> z (no-filelog no-sidedata !)
452 $ hg debugpathcopies 2 5
461 $ hg debugpathcopies 2 5
453 x -> z (no-filelog !)
462 x -> z (no-filelog no-sidedata !)
454 $ hg debugpathcopies 0 5
463 $ hg debugpathcopies 0 5
455 x -> z
464 x -> z
456
465
General Comments 0
You need to be logged in to leave comments. Login now