# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1360575998 -3600
# Node ID 7de0554bf19018b77a4fa3f5442794edb430f61b
# Parent  29abdb2aeccb93d9b7fcc43ac4707cdf580aa8b1# Parent  a0c5d16793548b7a3332fde988a1ec2e1e5ff38b
merge with stable

diff -r a0c5d1679354 -r 7de0554bf190 tests/test-evolve.t
--- a/tests/test-evolve.t	Mon Feb 11 10:44:54 2013 +0100
+++ b/tests/test-evolve.t	Mon Feb 11 10:46:38 2013 +0100
@@ -313,7 +313,7 @@
   recreate:[8] another feature that rox
   atop:[7] another feature
   computing new diff
-  commited as 53ff506edef1
+  commited as d3c9b3a5c458
   $ hg glog
   @  9	feature-B: bumped update to 5f4744038ed5: - test
   |
diff -r a0c5d1679354 -r 7de0554bf190 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Mon Feb 11 10:44:54 2013 +0100
+++ b/tests/test-stabilize-result.t	Mon Feb 11 10:46:38 2013 +0100
@@ -157,9 +157,9 @@
   atop:[8] newer a
   rebasing to destination parent: e8cc1b534401
   computing new diff
-  commited as eeeb8f6e7648
+  commited as 503ef784bae6
   $ glog
-  @  14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961:
+  @  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
   |
   | o  9:355c5cda4de1@default(draft) bk:[] add c
   | |
@@ -188,7 +188,7 @@
   $ glog
   @  15:7391601a4bfa@default(draft) bk:[] More addition
   |
-  | o  14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961:
+  | o  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
   | |
   o |  9:355c5cda4de1@default(draft) bk:[] add c
   | |
@@ -214,7 +214,7 @@
   |
   | o  17:4754d61bc2db@default(draft) bk:[] More addition
   |/
-  | o  14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961:
+  | o  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
   | |
   o |  9:355c5cda4de1@default(draft) bk:[] add c
   | |
@@ -249,7 +249,7 @@
   $ glog
   @  22:ac6d600735a4@default(draft) bk:[] More addition
   |
-  | o  14:eeeb8f6e7648@default(draft) bk:[] bumped update to e3183e9c0961:
+  | o  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
   | |
   o |  9:355c5cda4de1@default(draft) bk:[] add c
   | |