equal
deleted
inserted
replaced
330 $ hg up -q 6 |
330 $ hg up -q 6 |
331 $ hg graft 7 |
331 $ hg graft 7 |
332 skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f) |
332 skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f) |
333 [255] |
333 [255] |
334 |
334 |
|
335 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 |
|
336 --- */hg-5c095ad7e90f.patch * +0000 (glob) |
|
337 +++ */hg-7a4785234d87.patch * +0000 (glob) |
|
338 @@ -1,18 +1,18 @@ |
|
339 # HG changeset patch |
|
340 -# User test |
|
341 +# User foo |
|
342 # Date 0 0 |
|
343 # Thu Jan 01 00:00:00 1970 +0000 |
|
344 -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
|
345 -# Parent 5d205f8b35b66bc36375c9534ffd3237730e8f04 |
|
346 +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9 |
|
347 +# Parent b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f |
|
348 2 |
|
349 |
|
350 -diff -r 5d205f8b35b6 -r 5c095ad7e90f a |
|
351 +diff -r b592ea63bb0c -r 7a4785234d87 a |
|
352 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
353 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
354 @@ -1,1 +0,0 @@ |
|
355 --b |
|
356 -diff -r 5d205f8b35b6 -r 5c095ad7e90f b |
|
357 +-a |
|
358 +diff -r b592ea63bb0c -r 7a4785234d87 b |
|
359 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
360 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
361 @@ -0,0 +1,1 @@ |
|
362 -+b |
|
363 ++a |
|
364 [1] |
|
365 |
|
366 |
335 Disallow grafting already grafted csets with the same origin onto each other |
367 Disallow grafting already grafted csets with the same origin onto each other |
336 $ hg up -q 13 |
368 $ hg up -q 13 |
337 $ hg graft 2 |
369 $ hg graft 2 |
338 skipping revision 2:5c095ad7e90f (already grafted to 13:7a4785234d87) |
370 skipping revision 2:5c095ad7e90f (already grafted to 13:7a4785234d87) |
339 [255] |
371 [255] |