Mercurial > hg

diff tests/test-import-merge.t @ 19628:3193b23eec61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
solaris: tests can't use tail -n Solaris tail doesn't recognize the -n option. Replace the one use of it with some inline python code, and add a test case to check-code.py.
author Danek Duvall <danek.duvall@oracle.com>
date Mon, 26 Aug 2013 15:20:44 -0700
parents 8eb3408bf005
children 3a3731a60354
line wrap: on
line diff
--- a/tests/test-import-merge.t	Fri Aug 23 16:05:38 2013 -0700
+++ b/tests/test-import-merge.t	Mon Aug 26 15:20:44 2013 -0700
@@ -129,7 +129,9 @@
   $ echo a>>a
   $ hg ci -m3
   $ hg export 2 | head -7 > ../a.patch
-  $ hg export tip | tail -n +8 >> ../a.patch
+  $ hg export tip > out
+  >>> apatch = open("../a.patch", "a")
+  >>> apatch.write("".join(open("out").readlines()[7:]))
 
   $ cd ..
   $ hg clone -qr0 repo3 repo3-clone