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

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

test-serve: wait before killing to always hide the "killed!" message....
test-serve: wait before killing to always hide the "killed!" message. Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r5986:a732eebf default
r6000:8e7d6498 default
Show More
test-import.out
219 lines | 5.4 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
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
% 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
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
transaction abort!
rollback completed
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
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
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
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
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
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
% 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
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
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
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
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
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
transaction abort!
rollback completed
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
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
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 ---
"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
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
applying tip.patch
patching file a
Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).
a
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