Mercurial > hg
diff tests/test-import.out @ 9611:a3d73b3e1f8a
hg.clone: report branch name on update
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 16 Oct 2009 23:57:34 +0200 |
parents | c156bf947e26 |
children | 832f35386067 |
line wrap: on
line diff
--- a/tests/test-import.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-import.out Fri Oct 16 23:57:34 2009 +0200 @@ -6,7 +6,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch % message should be same @@ -19,7 +19,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch line2 @@ -29,7 +29,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch abort: empty commit message @@ -39,7 +39,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch % import of plain diff with specific date and user @@ -48,7 +48,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch changeset: 1:ca68f19f3a40 @@ -73,7 +73,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch diff -r 80971e65b431 a @@ -88,7 +88,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying tip.patch % import from stdin @@ -97,7 +97,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % override commit message @@ -106,7 +106,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin summary: override @@ -116,7 +116,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../msg.patch user: email patcher @@ -127,7 +127,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % plain diff in email, subject, no message body @@ -136,7 +136,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % plain diff in email, no subject, no message body, should fail @@ -145,7 +145,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin abort: empty commit message @@ -155,7 +155,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin summary: second change @@ -165,7 +165,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin email patch @@ -184,7 +184,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../../../tip.patch % message should be 'subdir change'