| changeset 43140 | 12b8a2ef8d04 |
| parent 42595 | 819712deac69 |
| child 43146 | 0171483b082f |
| 43139:f78ad4caa5ad | 43140:12b8a2ef8d04 |
|---|---|
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] |
5 > rebase= |
5 > rebase= |
6 > [alias] |
6 > [alias] |
17 #if changeset |
17 #if changeset |
18 $ cat >> $HGRCPATH << EOF |
18 $ cat >> $HGRCPATH << EOF |
19 > [experimental] |
19 > [experimental] |
20 > copies.read-from = changeset-only |
20 > copies.read-from = changeset-only |
21 > copies.write-to = changeset-only |
21 > copies.write-to = changeset-only |
22 > EOF |
|
23 #endif |
|
24 |
|
25 #if sidedata |
|
26 $ cat >> $HGRCPATH << EOF |
|
27 > [format] |
|
28 > exp-use-copies-side-data-changeset = yes |
|
22 > EOF |
29 > EOF |
23 #endif |
30 #endif |
24 |
31 |
25 $ REPONUM=0 |
32 $ REPONUM=0 |
26 $ newrepo() { |
33 $ newrepo() { |
170 o 1 modify x |
177 o 1 modify x |
171 | x |
178 | x |
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 |
180 #else |
187 #else |
181 BROKEN: This should succeed and merge the changes from x into y |
188 BROKEN: This should succeed and merge the changes from x into y |
338 | o 1 add x |
345 | o 1 add x |
339 |/ x |
346 |/ x |
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) |
348 file 'x' was deleted in local [local] but was modified in other [graft]. |
359 file 'x' was deleted in local [local] but was modified in other [graft]. |
349 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
360 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
350 What do you want to do? u |
361 What do you want to do? u |
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 |
361 $ hg graft -r 5 |
368 $ hg graft -r 5 |
362 grafting 5:* "rename x to y"* (glob) |
369 grafting 5:* "rename x to y"* (glob) |