Mercurial > evolve

diff tests/test-obsolete.t @ 587:8152fedbac65 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: smarter code for divergent changeset This newer version properly handle split now. Code and test copied for future upstream one.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 23 Oct 2012 16:36:29 +0200
parents f01721161532
children 02cadd3dc9f4 26f76b38f879
line wrap: on
line diff
--- a/tests/test-obsolete.t	Tue Oct 23 15:44:24 2012 +0200
+++ b/tests/test-obsolete.t	Tue Oct 23 16:36:29 2012 +0200
@@ -644,7 +644,13 @@
   latecomer: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'conflicting()'
-  changeset:   1[46]:50f11e5e3a63 (re)
+  changeset:   12:6db5e282cb91
+  parent:      10:2033b4e49474
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     add obsol_d'''
+  
+  changeset:   14:50f11e5e3a63
   tag:         tip
   parent:      11:9468a5f5d8b2
   user:        test