test-import.out
350 lines
| 8.1 KiB
| text/plain
|
TextLexer
/ tests / test-import.out
|
r2513 | adding a | ||
|
r2773 | adding d1/d2/a | ||
|
r2513 | % import exported patch | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying ../tip.patch | ||
% message should be same | ||||
summary: second change | ||||
% committer should be same | ||||
user: someone | ||||
|
r7247 | % import exported patch with external patcher | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
|
r9611 | updating to branch default | ||
|
r7247 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
applying ../tip.patch | ||||
line2 | ||||
|
r2513 | % import of plain diff should fail without message | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying ../tip.patch | ||
|
r5757 | abort: empty commit message | ||
|
r2513 | % import of plain diff should be ok with message | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying ../tip.patch | ||
|
r5953 | % import of plain diff with specific date and user | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
|
r9611 | updating to branch default | ||
|
r5953 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
applying ../tip.patch | ||||
changeset: 1:ca68f19f3a40 | ||||
tag: tip | ||||
user: user@nowhere.net | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
files: a | ||||
description: | ||||
patch | ||||
diff -r 80971e65b431 -r ca68f19f3a40 a | ||||
--- a/a Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/a Thu Jan 01 00:00:01 1970 +0000 | ||||
@@ -1,1 +1,2 @@ | ||||
line 1 | ||||
+line 2 | ||||
|
r5937 | % import of plain diff should be ok with --no-commit | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
|
r9611 | updating to branch default | ||
|
r5937 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
applying ../tip.patch | ||||
diff -r 80971e65b431 a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -1,1 +1,2 @@ | ||||
line 1 | ||||
+line 2 | ||||
|
r4230 | % hg -R repo import | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
|
r9611 | updating to branch default | ||
|
r4230 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
applying tip.patch | ||||
|
r2513 | % import from stdin | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying patch from stdin | ||
|
r10384 | % import two patches in one stream | ||
applying patch from stdin | ||||
applied 80971e65b431 | ||||
1d4bd90af0e4 tip | ||||
1d4bd90af0e4 tip | ||||
|
r2513 | % override commit message | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying patch from stdin | ||
summary: override | ||||
% plain diff in email, subject, message body | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying ../msg.patch | ||
user: email patcher | ||||
summary: email patch | ||||
% plain diff in email, no subject, message body | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying patch from stdin | ||
% plain diff in email, subject, no message body | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying patch from stdin | ||
% plain diff in email, no subject, no message body, should fail | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying patch from stdin | ||
|
r5757 | abort: empty commit message | ||
|
r2513 | % hg export in email, should use patch header | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r2773 | added 1 changesets with 2 changes to 2 files | ||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2513 | applying patch from stdin | ||
summary: second change | ||||
|
r4779 | % plain diff in email, [PATCH] subject, message body with subject | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
|
r9611 | updating to branch default | ||
|
r4779 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
applying patch from stdin | ||||
email patch | ||||
next line | ||||
|
r5418 | --- | ||
|
r5986 | % import patch1 patch2; rollback | ||
parent: 0 | ||||
applying ../patch1 | ||||
applying ../patch2 | ||||
|
r10384 | applied 1d4bd90af0e4 | ||
|
r5986 | rolling back last transaction | ||
parent: 1 | ||||
|
r2773 | % hg import in a subdirectory | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
|
r9611 | updating to branch default | ||
|
r2773 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
applying ../../../tip.patch | ||||
% message should be 'subdir change' | ||||
summary: subdir change | ||||
% committer should be 'someoneelse' | ||||
user: someoneelse | ||||
% should be empty | ||||
|
r5548 | % test fuzziness | ||
adding a | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r6336 | created new head | ||
|
r5548 | applying tip.patch | ||
patching file a | ||||
Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). | ||||
|
r10524 | reverting a | ||
% test fuzziness with eol=auto | ||||
applying tip.patch | ||||
patching file a | ||||
Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). | ||||
|
r5852 | adding a | ||
adding b1 | ||||
adding c1 | ||||
adding d | ||||
diff --git a/a b/a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
diff --git a/b1 b/b2 | ||||
rename from b1 | ||||
rename to b2 | ||||
--- a/b1 | ||||
+++ b/b2 | ||||
@@ -0,0 +1,1 @@ | ||||
+b | ||||
diff --git a/c1 b/c1 | ||||
--- a/c1 | ||||
+++ b/c1 | ||||
@@ -0,0 +1,1 @@ | ||||
+c | ||||
diff --git a/c1 b/c2 | ||||
copy from c1 | ||||
copy to c2 | ||||
--- a/c1 | ||||
+++ b/c2 | ||||
@@ -0,0 +1,1 @@ | ||||
+c | ||||
diff --git a/d b/d | ||||
--- a/d | ||||
+++ b/d | ||||
@@ -1,1 +0,0 @@ | ||||
-d | ||||
4 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
applying empty.diff | ||||
% a file | ||||
a | ||||
% b1 file | ||||
% b2 file | ||||
b | ||||
% c1 file | ||||
c | ||||
% c2 file | ||||
c | ||||
% d file | ||||
|
r6179 | % test trailing binary removal | ||
adding a | ||||
adding b | ||||
R a | ||||
R b | ||||
diff --git a/a b/a | ||||
diff --git a/b b/b | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
applying remove.diff | ||||
|
r6295 | % test update+rename with common name (issue 927) | ||
adding a | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
applying copy.diff | ||||
% view a | ||||
a | ||||
% view a2 | ||||
a | ||||
|
r6520 | % test -p0 | ||
adding a | ||||
applying patch from stdin | ||||
bb | ||||
|
r6758 | % test paths outside repo root | ||
applying patch from stdin | ||||
abort: ../outside/foo not under root | ||||
|
r7402 | % test import with similarity (issue295) | ||
adding a | ||||
applying ../rename.diff | ||||
patching file a | ||||
patching file b | ||||
removing a | ||||
adding b | ||||
recording removal of a as rename to b (88% similar) | ||||
A b | ||||
a | ||||
R a | ||||
undeleting a | ||||
forgetting b | ||||
applying ../rename.diff | ||||
patching file a | ||||
patching file b | ||||
removing a | ||||
adding b | ||||
A b | ||||
R a | ||||
|
r7971 | % add empty file from the end of patch (issue 1495) | ||
adding a | ||||
applying a.patch | ||||
|
r9328 | % create file when source is not /dev/null | ||
applying ../create.patch | ||||
a | ||||
|
r10745 | applying ../create2.patch | ||
a | ||||
|
r9573 | % first line mistaken for email headers (issue 1859) | ||
applying a.patch | ||||
changeset: 0:5a681217c0ad | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
files: a | ||||
description: | ||||
module: summary | ||||
description | ||||
|
r10729 | % --- in commit message | ||
applying a.patch | ||||
changeset: 0:f34d9187897d | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
files: a | ||||
description: | ||||
module: summary | ||||
|
r10501 | % tricky header splitting | ||
applying ../trickyheaders.patch | ||||
# HG changeset patch | ||||
# User User B | ||||
# Date 0 0 | ||||
# Node ID eb56ab91903632294ac504838508cb370c0901d2 | ||||
# Parent 0000000000000000000000000000000000000000 | ||||
from: tricky! | ||||
That is not a header. | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,1 @@ | ||||
+foo | ||||