# HG changeset patch # User Pierre-Yves David # Date 1329502116 -3600 # Node ID 605ed785268a39f1d7499282bd6086708fe556f7 # Parent bbc653876876c93294b3c7427a3ee757bdaaa763 stuff that pass diff -r bbc653876876 -r 605ed785268a tests/test-evolve.t --- a/tests/test-evolve.t Fri Feb 17 19:01:25 2012 +0100 +++ b/tests/test-evolve.t Fri Feb 17 19:08:36 2012 +0100 @@ -215,10 +215,10 @@ feature-B 4:f8111a076f09 $ hg up 6 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg bookmark -if feature-A $ hg bookmark feature-A 6:23409eba69a0 feature-B 4:f8111a076f09 - $ hg bookmark -if feature-A $ hg graft -O 4 grafting revision 4 merging main-file-1