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 | |
@@ -172,8 +179,8 b' the break.' | |||||
172 | o 0 add x |
|
179 | o 0 add x | |
173 | x |
|
180 | x | |
174 | $ hg debugpathcopies 0 5 |
|
181 | $ hg debugpathcopies 0 5 | |
175 | x -> y (no-filelog !) |
|
182 | x -> y (no-filelog no-sidedata !) | |
176 | #if no-filelog |
|
183 | #if no-filelog no-sidedata | |
177 | $ hg graft -r 2 |
|
184 | $ hg graft -r 2 | |
178 | grafting 2:* "modify x again" (glob) |
|
185 | grafting 2:* "modify x again" (glob) | |
179 | merging y and x to y |
|
186 | merging y and x to y | |
@@ -340,8 +347,12 b' different between the branches.' | |||||
340 | o 0 base |
|
347 | o 0 base | |
341 | a |
|
348 | a | |
342 | $ hg debugpathcopies 1 5 |
|
349 | $ hg debugpathcopies 1 5 | |
343 | x -> y (no-filelog !) |
|
350 | x -> y (no-filelog no-sidedata !) | |
344 | #if filelog |
|
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 | BROKEN: This should succeed and merge the changes from x into y |
|
356 | BROKEN: This should succeed and merge the changes from x into y | |
346 | $ hg graft -r 2 |
|
357 | $ hg graft -r 2 | |
347 | grafting 2:* "modify x" (glob) |
|
358 | grafting 2:* "modify x" (glob) | |
@@ -351,10 +362,6 b' BROKEN: This should succeed and merge th' | |||||
351 | abort: unresolved conflicts, can't continue |
|
362 | abort: unresolved conflicts, can't continue | |
352 | (use 'hg resolve' and 'hg graft --continue') |
|
363 | (use 'hg resolve' and 'hg graft --continue') | |
353 | [255] |
|
364 | [255] | |
354 | #else |
|
|||
355 | $ hg graft -r 2 |
|
|||
356 | grafting 2:* "modify x" (glob) |
|
|||
357 | merging y and x to y |
|
|||
358 | #endif |
|
365 | #endif | |
359 | $ hg co -qC 2 |
|
366 | $ hg co -qC 2 | |
360 | BROKEN: This should succeed and merge the changes from x into y |
|
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