equal
deleted
inserted
replaced
370 EOF |
370 EOF |
371 hg import -d '0 0' a.patch |
371 hg import -d '0 0' a.patch |
372 hg parents -v |
372 hg parents -v |
373 cd .. |
373 cd .. |
374 |
374 |
|
375 echo '% tricky header splitting' |
|
376 cat > trickyheaders.patch <<EOF |
|
377 From: User A <user@a> |
|
378 Subject: [PATCH] from: tricky! |
|
379 |
|
380 # HG changeset patch |
|
381 # User User B |
|
382 # Date 1266264441 18000 |
|
383 # Branch stable |
|
384 # Node ID f2be6a1170ac83bf31cb4ae0bad00d7678115bc0 |
|
385 # Parent 0000000000000000000000000000000000000000 |
|
386 from: tricky! |
|
387 |
|
388 That is not a header. |
|
389 |
|
390 diff -r 000000000000 -r f2be6a1170ac foo |
|
391 --- /dev/null |
|
392 +++ b/foo |
|
393 @@ -0,0 +1,1 @@ |
|
394 +foo |
|
395 EOF |
|
396 |
|
397 hg init trickyheaders |
|
398 cd trickyheaders |
|
399 hg import -d '0 0' ../trickyheaders.patch |
|
400 hg export --git tip |
|
401 cd .. |