Mercurial > public > mercurial-scm > hg

diff tests/test-merge-default.t @ 26716:c027641f8a83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: rename and test '_destmerge' We make the name consistent with the one used by '_destupdate' and we ensure the code is run by testing it (abort is expected and merge would).
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 15 Oct 2015 01:47:28 +0100
parents 94f77624dbb5
children 72072cfc7e91
line wrap: on
line diff
--- a/tests/test-merge-default.t	Thu Oct 15 01:19:32 2015 +0100
+++ b/tests/test-merge-default.t	Thu Oct 15 01:47:28 2015 +0100
@@ -108,3 +108,10 @@
   5:a431fabd6039
   6:e88e33f3bf62
 
+Test experimental destination revset
+
+  $ hg log -r '_destmerge()'
+  abort: branch 'foobranch' has one head - please merge with an explicit rev
+  (run 'hg heads' to see all heads)
+  [255]
+