Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 04 Jan 2013 20:12:31 +0000
changeset 1181 07a7aabca5ce
parent 1179 e4157fb1161d (current diff)
parent 1180 68d1d29f6496 (diff)
child 1185 5ac75dd311d5
Merge with stable
--- a/tests/test-keyword.t	Sat Dec 29 02:35:54 2012 +0000
+++ b/tests/test-keyword.t	Fri Jan 04 20:12:31 2013 +0000
@@ -578,7 +578,6 @@
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
-  removing unknown node 40a904bbbe4c from 1-phase boundary
   overwriting c expanding keywords
   committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
   $ cat a c
@@ -749,7 +748,6 @@
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
   a
-  removing unknown node 40a904bbbe4c from 1-phase boundary
   overwriting a expanding keywords
   committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
   $ rm log