Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-import.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 25 Jan 2008 16:18:49 +0100
changeset 5937 d8878742a924
parent 5853 deb0d3518674
child 5953 e7f1be4bf40a
permissions -rw-r--r--
Test case for hg import --no-commit
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
     2
 
adding d1/d2/a
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
% import exported patch
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
     8
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
     9
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
applying ../tip.patch
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
% message should be same
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
summary:     second change
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
% committer should be same
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
user:        someone
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
% import of plain diff should fail without message
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    16
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    17
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    18
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    19
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    20
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    21
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    22
 
applying ../tip.patch
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    23
 
transaction abort!
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    24
 
rollback completed
5757
c5793dada959 Clarify some messages during commit:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5754
diff changeset 
    25
 
abort: empty commit message
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    26
 
% import of plain diff should be ok with message
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    27
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    28
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    29
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    30
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    31
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    32
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    33
 
applying ../tip.patch
5937
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    34
 
% import of plain diff should be ok with --no-commit
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    35
 
requesting all changes
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    36
 
adding changesets
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    37
 
adding manifests
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    38
 
adding file changes
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    39
 
added 1 changesets with 2 changes to 2 files
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    40
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    41
 
applying ../tip.patch
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    42
 
diff -r 80971e65b431 a
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    43
 
--- a/a
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    44
 
+++ b/a
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    45
 
@@ -1,1 +1,2 @@
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    46
 
 line 1
d8878742a924 Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5853
diff changeset 
    47
 
+line 2
4230
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    48
 
% hg -R repo import
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    49
 
requesting all changes
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    50
 
adding changesets
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    51
 
adding manifests
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    52
 
adding file changes
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    53
 
added 1 changesets with 2 changes to 2 files
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    54
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
c93562fb12cc Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2919
diff changeset 
    55
 
applying tip.patch
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    56
 
% import from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    57
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    58
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    59
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    60
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    61
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    62
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    63
 
applying patch from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    64
 
% override commit message
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    65
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    66
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    67
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    68
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    69
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    70
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    71
 
applying patch from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    72
 
summary:     override
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    73
 
% plain diff in email, subject, message body
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    74
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    75
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    76
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    77
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    78
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    79
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    80
 
applying ../msg.patch
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    81
 
user:        email patcher
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    82
 
summary:     email patch
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    83
 
% plain diff in email, no subject, message body
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    84
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    85
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    86
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    87
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    88
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    89
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    90
 
applying patch from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    91
 
% plain diff in email, subject, no message body
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    92
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    93
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    94
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    95
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    96
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
    97
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    98
 
applying patch from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    99
 
% plain diff in email, no subject, no message body, should fail
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   100
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   101
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   102
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   103
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
   104
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
   105
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   106
 
applying patch from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   107
 
transaction abort!
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   108
 
rollback completed
5757
c5793dada959 Clarify some messages during commit:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5754
diff changeset 
   109
 
abort: empty commit message
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   110
 
% hg export in email, should use patch header
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   111
 
requesting all changes
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   112
 
adding changesets
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   113
 
adding manifests
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   114
 
adding file changes
2773
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
   115
 
added 1 changesets with 2 changes to 2 files
871ca5b9d348 Import say a file is not tracked after patching : test case
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2513
diff changeset 
   116
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2513
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   117
 
applying patch from stdin
f22e3e8fd457 import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
   118
 
summary:     second change
4779
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   119
 
% plain diff in email, [PATCH] subject, message body with subject
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   120
 
requesting all changes
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   121
 
adding changesets
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   122
 
adding manifests
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   123
 
adding file changes
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   124
 
added 1 changesets with 2 changes to 2 files
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   125
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   126
 
applying patch from stdin
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   127
 
email patch
a7915f79d4cc Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4230
diff changeset 
   128
 












a7915f79d4cc
Added import test for [PATCH] subject and message body with subject



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4230

diff
changeset




   129


next line







5418






9b469bdb1ce1
patch: fix git sendmail handling without proper mail headers



Patrick Mezard <pmezard@gmail.com>


parents: 
4779

diff
changeset




   130


---







2773






871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   131


% hg import in a subdirectory












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   132


requesting all changes












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   133


adding changesets












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   134


adding manifests












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   135


adding file changes












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   136


added 1 changesets with 2 changes to 2 files












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   137


2 files updated, 0 files merged, 0 files removed, 0 files unresolved












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   138


applying ../../../tip.patch












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   139


% message should be 'subdir change'












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   140


summary:     subdir change












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   141


% committer should be 'someoneelse'












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   142


user:        someoneelse












871ca5b9d348
Import say a file is not tracked after patching : test case



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 
2513

diff
changeset




   143


% should be empty







5548






1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   144


% test fuzziness












1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   145


adding a












1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   146


1 files updated, 0 files merged, 0 files removed, 0 files unresolved












1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   147


applying tip.patch












1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   148


patching file a












1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   149


Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).












1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations



Patrick Mezard <pmezard@gmail.com>


parents: 
5418

diff
changeset




   150


a







5852






03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   151


adding a












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   152


adding b1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   153


adding c1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   154


adding d












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   155


diff --git a/a b/a












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   156


--- a/a












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   157


+++ b/a












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   158


@@ -0,0 +1,1 @@












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   159


+a












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   160


diff --git a/b1 b/b2












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   161


rename from b1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   162


rename to b2












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   163


--- a/b1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   164


+++ b/b2












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   165


@@ -0,0 +1,1 @@












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   166


+b












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   167


diff --git a/c1 b/c1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   168


--- a/c1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   169


+++ b/c1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   170


@@ -0,0 +1,1 @@












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   171


+c












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   172


diff --git a/c1 b/c2












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   173


copy from c1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   174


copy to c2












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   175


--- a/c1












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   176


+++ b/c2












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   177


@@ -0,0 +1,1 @@












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   178


+c












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   179


diff --git a/d b/d












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   180


--- a/d












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   181


+++ b/d












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   182


@@ -1,1 +0,0 @@












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   183


-d












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   184


4 files updated, 0 files merged, 2 files removed, 0 files unresolved












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   185


applying empty.diff












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   186


% a file












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   187


a












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   188


% b1 file












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   189


% b2 file












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   190


b












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   191


% c1 file












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   192


c












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   193


% c2 file












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   194


c












03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)



Patrick Mezard <pmezard@gmail.com>


parents: 
5548

diff
changeset




   195


% d file














mercurial