Mercurial > hg-git

changeset 420:ac36f1a05672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-incoming: fixes for hg 1.7
author Augie Fackler <durin42@gmail.com>
date Fri, 17 Jun 2011 16:20:08 -0500
parents d89d4e93bc46
children abc765fbfc9a
files tests/test-incoming tests/test-incoming.out
diffstat 2 files changed, 7 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-incoming	Tue May 31 19:36:53 2011 -0500
+++ b/tests/test-incoming	Fri Jun 17 16:20:08 2011 -0500
@@ -59,7 +59,7 @@
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 
 cd hgrepo
-hg incoming
+hg incoming | grep -v 'no changes found' | grep -v 'bookmark:'
 
 cd ../gitrepo
 echo beta > beta
@@ -67,7 +67,7 @@
 commit -m 'add beta'
 
 cd ../hgrepo
-hg incoming
+hg incoming | grep -v 'no changes found' | grep -v 'bookmark:'
 
 cd ../gitrepo
 git checkout -b b1 HEAD^
@@ -82,15 +82,15 @@
 commit -m'add d/gamma line 2'
 
 cd ../hgrepo
-hg incoming -p
+hg incoming -p | grep -v 'no changes found' | grep -v 'bookmark:'
 
 echo % incoming -r
-hg incoming -r master
-hg incoming -r b1
-hg incoming -r t1
+hg incoming -r master | grep -v 'no changes found' | grep -v 'bookmark:'
+hg incoming -r b1 | grep -v 'no changes found' | grep -v 'bookmark:'
+hg incoming -r t1 | grep -v 'no changes found' | grep -v 'bookmark:'
 
 echo % nothing incoming after pull
 hg pull
-hg incoming
+hg incoming | grep -v 'no changes found' | grep -v 'bookmark:'
 
 echo 'done'
--- a/tests/test-incoming.out	Tue May 31 19:36:53 2011 -0500
+++ b/tests/test-incoming.out	Fri Jun 17 16:20:08 2011 -0500
@@ -5,13 +5,11 @@
 importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 comparing with git://localhost/gitrepo
-no changes found
 comparing with git://localhost/gitrepo
 Counting objects: 3, done.
 Compressing objects:  50% (1/2)   
Compressing objects: 100% (2/2)   
Compressing objects: 100% (2/2), done.
 Total 3 (delta 0), reused 0 (delta 0)
 changeset:   1:9497a4ee62e1
-bookmark:    master
 user:        test <test@example.org>
 date:        Mon Jan 01 00:00:11 2007 +0000
 summary:     add beta
@@ -22,7 +20,6 @@
 Compressing objects:  25% (1/4)   
Compressing objects:  50% (2/4)   
Compressing objects:  75% (3/4)   
Compressing objects: 100% (4/4)   
Compressing objects: 100% (4/4), done.
 Total 8 (delta 0), reused 0 (delta 0)
 changeset:   1:9497a4ee62e1
-bookmark:    master
 user:        test <test@example.org>
 date:        Mon Jan 01 00:00:11 2007 +0000
 summary:     add beta
@@ -47,7 +44,6 @@
 +gamma
 
 changeset:   3:5202f48c20c9
-bookmark:    b1
 user:        test <test@example.org>
 date:        Mon Jan 01 00:00:13 2007 +0000
 summary:     add d/gamma line 2
@@ -62,7 +58,6 @@
 % incoming -r
 comparing with git://localhost/gitrepo
 changeset:   1:9497a4ee62e1
-bookmark:    master
 user:        test <test@example.org>
 date:        Mon Jan 01 00:00:11 2007 +0000
 summary:     add beta
@@ -75,7 +70,6 @@
 summary:     add d/gamma
 
 changeset:   2:5202f48c20c9
-bookmark:    b1
 user:        test <test@example.org>
 date:        Mon Jan 01 00:00:13 2007 +0000
 summary:     add d/gamma line 2
@@ -92,5 +86,4 @@
 importing git objects into hg
 (run 'hg heads' to see heads, 'hg merge' to merge)
 comparing with git://localhost/gitrepo
-no changes found
 done