# HG changeset patch # User Augie Fackler # Date 1377711682 14400 # Node ID f1bac7f37a05f7f29e65f5a64db0d14a747b9623 # Parent c42bf64d88a8dc2a98bdcc661d5c8fd07864cdbf Update test output to handle 65d8a43b adding some more objects. diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -42,7 +42,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 2 blobs updating reference refs/heads/master $ cd .. diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t --- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -25,7 +25,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 2 blobs updating reference refs/heads/master $ echo gamma >> beta @@ -34,7 +34,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 2 blobs updating reference refs/heads/master $ echo gamma > gamma @@ -44,7 +44,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 3 blobs updating reference refs/heads/master $ echo delta > delta @@ -54,7 +54,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 4 blobs updating reference refs/heads/master $ echo epsilon > epsilon @@ -64,7 +64,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 5 blobs updating reference refs/heads/master $ echo zeta > zeta @@ -74,7 +74,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 6 blobs updating reference refs/heads/master $ echo eta > eta @@ -84,7 +84,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 7 blobs updating reference refs/heads/master $ echo theta > theta @@ -94,7 +94,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 8 blobs updating reference refs/heads/master $ hg log --graph | egrep -v ': *(not-master|master)' diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t --- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -24,7 +24,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 0 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ hg branch gamma | grep -v 'permanent and global' @@ -34,7 +34,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 0 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ hg log --graph | egrep -v ': *(not-master|master)' diff --git a/tests/test-hg-tags-invalid.t b/tests/test-hg-tags-invalid.t --- a/tests/test-hg-tags-invalid.t +++ b/tests/test-hg-tags-invalid.t @@ -25,7 +25,7 @@ Skipping export of tag bet*a because it has invalid name as a git refname. searching for changes adding objects - added 2 commits with 2 trees and 2 blobs + added 2 commits with 2 trees and 3 blobs adding reference refs/tags/alph#a updating reference refs/heads/master diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t --- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -23,7 +23,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 2 blobs adding reference refs/tags/alpha updating reference refs/heads/master diff --git a/tests/test-push.t b/tests/test-push.t --- a/tests/test-push.t +++ b/tests/test-push.t @@ -30,7 +30,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 2 blobs adding reference refs/heads/beta $ cd .. @@ -104,7 +104,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 3 blobs updating reference refs/heads/master this should fail, no changes to push diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -39,8 +39,8 @@ 1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull .hgsub shall list two [git] subrepos $ cat .hgsub + xyz/subrepo2 = [git]../gitsubrepo subrepo1 = [git]../gitsubrepo - xyz/subrepo2 = [git]../gitsubrepo .hgsubstate shall list two idenitcal revisions $ cat .hgsubstate 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 @@ -73,7 +73,7 @@ pushing to $TESTTMP/gitrepo1 searching for changes adding objects - added 1 commits with 2 trees and 1 blobs + added 1 commits with 2 trees and 2 blobs updating reference refs/heads/master $ cd .. $ cd gitrepo1 @@ -103,14 +103,15 @@ importing git objects into hg (run 'hg update' to get a working copy) $ hg checkout -C + updating to active bookmark master cloning subrepo hgsub from $TESTTMP/hgsub 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. pull shall bring .hgsub entry which was added to the git repo $ cat hgrepo/.hgsub hgsub = $TESTTMP/hgsub + xyz/subrepo2 = [git]../gitsubrepo subrepo1 = [git]../gitsubrepo - xyz/subrepo2 = [git]../gitsubrepo .hgsubstate shall list revision of the subrepo added through git repo $ cat hgrepo/.hgsubstate 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub