Mercurial > public > mercurial-scm > hg

diff tests/test-merge-symlinks.t @ 13439:d724a69309e0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: flush stdout before calling external processes stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 18 Feb 2011 03:35:01 +0100
parents de793925862e
children cd3032437064
line wrap: on
line diff
--- a/tests/test-merge-symlinks.t	Fri Feb 18 03:34:47 2011 +0100
+++ b/tests/test-merge-symlinks.t	Fri Feb 18 03:35:01 2011 +0100
@@ -38,11 +38,11 @@
 merge heads
 
   $ hg merge --tool="python ../echo.py"
+  merging l
   HG_FILE l
   HG_MY_ISLINK 1
   HG_OTHER_ISLINK 0
   HG_BASE_ISLINK 0
-  merging l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
@@ -54,9 +54,9 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg copy l l2
   $ HGMERGE="python ../echo.py" hg up 3
+  merging l2
   HG_FILE l2
   HG_MY_ISLINK 1
   HG_OTHER_ISLINK 0
   HG_BASE_ISLINK 0
-  merging l2
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved