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

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

cmdutil: always expose "files_add", "files_del" and "manifest" templater properties
cmdutil: always expose "files_add", "files_del" and "manifest" templater properties
Patrick Mezard - - Load All Authors

File last commit:

r5418:9b469bdb default
r5545:5a124ce4 default
Show More
test-import.out
127 lines | 3.7 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
% 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
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
% 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