##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/git: check status when reading the whole output
convert/git: check status when reading the whole output
Matt Mackall - - Load All Authors

File last commit:

r10893:468876bc default
r10986:610f0473 stable
Show More
test-import.out
381 lines | 8.9 KiB | text/plain | TextLexer
/ tests / test-import.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 adding a
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 adding d1/d2/a
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 % import exported patch
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying ../tip.patch
% message should be same
summary: second change
% committer should be same
user: someone
Patrick Mezard
patch: fix patched files records in externalpatcher()
 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
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Patrick Mezard
patch: fix patched files records in externalpatcher()
 r7247 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
line2
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 % import of plain diff should fail without message
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying ../tip.patch
Thomas Arendsen Hein
Clarify some messages during commit:...
 r5757 abort: empty commit message
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 % import of plain diff should be ok with message
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying ../tip.patch
Jesse Glick
Permitting the import command to accept a --user option....
 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
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Jesse Glick
Permitting the import command to accept a --user option....
 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
Thomas Arendsen Hein
Test case for hg import --no-commit
 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
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Thomas Arendsen Hein
Test case for hg import --no-commit
 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
Alexis S. L. Carvalho
Fix handling of paths when run outside the repo....
 r4230 % hg -R repo import
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Alexis S. L. Carvalho
Fix handling of paths when run outside the repo....
 r4230 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying tip.patch
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 % import from stdin
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying patch from stdin
Brendan Cully
import: import each patch in a file or stream as a separate change...
 r10384 % import two patches in one stream
applying patch from stdin
applied 80971e65b431
1d4bd90af0e4 tip
1d4bd90af0e4 tip
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 % override commit message
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying patch from stdin
summary: override
% plain diff in email, subject, message body
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 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
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying patch from stdin
% plain diff in email, subject, no message body
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 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
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying patch from stdin
Thomas Arendsen Hein
Clarify some messages during commit:...
 r5757 abort: empty commit message
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 % hg export in email, should use patch header
requesting all changes
adding changesets
adding manifests
adding file changes
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 added 1 changesets with 2 changes to 2 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 r2773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
import: added tests, fixed bugs found by tests and asak.
 r2513 applying patch from stdin
summary: second change
Thomas Arendsen Hein
Added import test for [PATCH] subject and message body with subject
 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
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Thomas Arendsen Hein
Added import test for [PATCH] subject and message body with subject
 r4779 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
email patch
next line
Patrick Mezard
patch: fix git sendmail handling without proper mail headers
 r5418 ---
Alexis S. L. Carvalho
hg import: write the dirstate after every commit...
 r5986 % import patch1 patch2; rollback
parent: 0
applying ../patch1
applying ../patch2
Brendan Cully
import: import each patch in a file or stream as a separate change...
 r10384 applied 1d4bd90af0e4
Alexis S. L. Carvalho
hg import: write the dirstate after every commit...
 r5986 rolling back last transaction
parent: 1
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 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
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
"Mathieu Clabaut "
Import say a file is not tracked after patching : test case
 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
Patrick Mezard
test-import: test fuzziness, ambiguous patch locations
 r5548 % test fuzziness
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Patrick Mezard
test-import: test fuzziness, ambiguous patch locations
 r5548 applying tip.patch
patching file a
Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).
Patrick Mezard
patch: fix patching with fuzz and eol normalization
 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).
Patrick Mezard
patch: handle empty vs no file in git patches (issue906)
 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
Patrick Mezard
patch: fix iterhunks() with trailing binary file removal...
 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
Patrick Mezard
patch: fix corner case with update + copy patch handling (issue 937)...
 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
Benoit Boissinot
fix import with -p0
 r6520 % test -p0
adding a
applying patch from stdin
bb
Brendan Cully
Check that git patches only touch files under root
 r6758 % test paths outside repo root
applying patch from stdin
abort: ../outside/foo not under root
Brendan Cully
import: add similarity option (issue295)
 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
Vsevolod Solovyov
Fix issue1495, corner case of adding empty files via patching
 r7971 % add empty file from the end of patch (issue 1495)
adding a
applying a.patch
Brendan Cully
patch: create file even if source is not /dev/null...
 r9328 % create file when source is not /dev/null
applying ../create.patch
a
Benoit Boissinot
patch: try harder to find the file to patch on file creation (issue2041)...
 r10745 applying ../create2.patch
a
Patrick Mezard
patch: do not swallow header-like patch first line (issue1859)...
 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
Benoit Boissinot
patch: enhance diff detection regexp, allow '--- ' in patch message
 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
Brendan Cully
import: if in doubt, consume stream until start of diff...
 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
Benoit Boissinot
patch: more precise NoHunk, raised for every file (issue2102)
 r10748 % issue2102
adding src/cmd/gc/mksys.bash
applying patch from stdin
parent: 1:d59915696727 tip
help management of empty pkg and lib directories in perforce
branch: default
commit: (clean)
update: (current)
diff --git a/lib/place-holder b/lib/place-holder
new file mode 100644
--- /dev/null
+++ b/lib/place-holder
@@ -0,0 +1,2 @@
+perforce does not maintain empty directories.
+this file helps.
diff --git a/pkg/place-holder b/pkg/place-holder
new file mode 100644
--- /dev/null
+++ b/pkg/place-holder
@@ -0,0 +1,2 @@
+perforce does not maintain empty directories.
+this file helps.
diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash
old mode 100644
new mode 100755
Peter Arrenbrecht
patch: don't look for headers in diff lines...
 r10883 % diff lines looking like headers
adding a
adding b
adding c
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin