##// END OF EJS Templates
sidedatacopies: introduce a sidedata testcase for test-copies-unrelated.t...
marmoute -
r43410:12b8a2ef 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 3 $ cat >> $HGRCPATH << EOF
4 4 > [extensions]
@@ -22,6 +22,13 b''
22 22 > EOF
23 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 32 $ REPONUM=0
26 33 $ newrepo() {
27 34 > cd $TESTTMP
@@ -172,8 +179,8 b' the break.'
172 179 o 0 add x
173 180 x
174 181 $ hg debugpathcopies 0 5
175 x -> y (no-filelog !)
176 #if no-filelog
182 x -> y (no-filelog no-sidedata !)
183 #if no-filelog no-sidedata
177 184 $ hg graft -r 2
178 185 grafting 2:* "modify x again" (glob)
179 186 merging y and x to y
@@ -340,8 +347,12 b' different between the branches.'
340 347 o 0 base
341 348 a
342 349 $ hg debugpathcopies 1 5
343 x -> y (no-filelog !)
344 #if filelog
350 x -> y (no-filelog no-sidedata !)
351 #if no-filelog no-sidedata
352 $ hg graft -r 2
353 grafting 2:* "modify x" (glob)
354 merging y and x to y
355 #else
345 356 BROKEN: This should succeed and merge the changes from x into y
346 357 $ hg graft -r 2
347 358 grafting 2:* "modify x" (glob)
@@ -351,10 +362,6 b' BROKEN: This should succeed and merge th'
351 362 abort: unresolved conflicts, can't continue
352 363 (use 'hg resolve' and 'hg graft --continue')
353 364 [255]
354 #else
355 $ hg graft -r 2
356 grafting 2:* "modify x" (glob)
357 merging y and x to y
358 365 #endif
359 366 $ hg co -qC 2
360 367 BROKEN: This should succeed and merge the changes from x into y
General Comments 0
You need to be logged in to leave comments. Login now