Mercurial > hg > hg-git

changeset 252:3e0eb85a83a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge test fixes.
author Augie Fackler <durin42@gmail.com>
date Fri, 25 Sep 2009 22:44:05 -0400
parents b9c94c21777e (current diff) ff2d4f541ae9 (diff)
children 505d7cdca198
files tests/test-empty-working-tree tests/test-empty-working-tree.out tests/test-merge tests/test-octopus tests/test-pull tests/test-tree-decomposition tests/test-tree-decomposition.out
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge
+++ b/tests/test-merge
@@ -70,8 +70,8 @@
 
 cd ..
 cd gitrepo2
-git log master
-git log beta
+git log master | sed 's/\.\.\.//g'
+git log beta | sed 's/\.\.\.//g'
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-octopus
+++ b/tests/test-octopus
@@ -74,7 +74,7 @@
 hg push git://localhost/gitrepo2
 
 cd ../gitrepo2
-git log
+git log | sed s/\\.\\.\\.//g
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-outgoing
+++ b/tests/test-outgoing
@@ -73,7 +73,7 @@
 echo % some more work on master from git
 cd gitrepo
 
-git checkout master
+git checkout master 2>&1 | sed s/\'/\"/g
 echo delta > delta
 git add delta
 commit -m "add delta"
--- a/tests/test-pull
+++ b/tests/test-pull
@@ -36,7 +36,7 @@
 
 git tag alpha
 
-git checkout -b beta  2>&1 | sed s/\'/\"/g
+git checkout -b beta 2>&1 | sed s/\'/\"/g
 echo beta > beta
 git add beta
 commit -m 'add beta'