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
changeset 22305 bdc0e04df243
parent 22250 f3200bf460a8
parent 22303 0c838e7459a5
child 34661 eb586ed5d8ce 
--- a/tests/test-import-merge.t	Sat Aug 23 21:23:02 2014 +0900
+++ b/tests/test-import-merge.t	Wed Aug 27 18:35:34 2014 +0200
@@ -72,6 +72,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
@@ -105,6 +107,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