Mercurial Mercurial > mercurial / diff
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-merge.t
branchstable
changeset 22303 0c838e7459a5
parent 20303 3a3731a60354
child 22305 bdc0e04df243 
--- a/tests/test-import-merge.t	Wed Aug 27 15:30:09 2014 +0200
+++ b/tests/test-import-merge.t	Wed Aug 27 23:10:06 2014 +0900
@@ -66,6 +66,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import ../merge.diff
   applying ../merge.diff
+  warning: import the patch as a normal revision
+  (use --exact to import the patch as a merge)
   $ tipparents
   2:890ecaa90481 addc
   $ hg strip --no-backup tip
@@ -99,6 +101,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import --bypass ../merge.diff
   applying ../merge.diff
+  warning: import the patch as a normal revision
+  (use --exact to import the patch as a merge)
   $ tipparents
   2:890ecaa90481 addc
   $ hg strip --no-backup tip
mercurial