Mercurial > hg-git

view tests/test-pull-after-strip.out @ 298:6ad6945b6629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: make it possible to un-wedge the repo after stripping git revs This adds a new command, which is inelegant, but it lets you safely pick up pulling fairly quickly.
author Augie Fackler <durin42@gmail.com>
date Thu, 25 Mar 2010 20:24:00 -0500
parents
children eec31dee258e
line wrap: on
line source

Initialized empty Git repository in gitrepo/.git/

Switched to a new branch "beta"
% clone a tag
importing Hg objects into Git
Counting objects: 3, done.
Total 3 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@  changeset:   0:3442585be8a6
   tag:         master
   tag:         default/master
   tag:         tip
   tag:         alpha
   user:        test <test@example.org>
   date:        Mon Jan 01 00:00:10 2007 +0000
   summary:     add alpha

% clone a branch
importing Hg objects into Git
Counting objects: 6, done.
Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
Total 6 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@  changeset:   1:7bcd915dc873
|  tag:         default/beta
|  tag:         tip
|  tag:         beta
|  user:        test <test@example.org>
|  date:        Mon Jan 01 00:00:11 2007 +0000
|  summary:     add beta
|
o  changeset:   0:3442585be8a6
   tag:         master
   tag:         alpha
   tag:         default/master
   user:        test <test@example.org>
   date:        Mon Jan 01 00:00:10 2007 +0000
   summary:     add alpha

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
pulling from git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 6, done.
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 6 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
abort: you appear to have run strip - please run hg git-cleanup
git commit map cleaned
pulling from git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 6, done.
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 6 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
(run 'hg update' to get a working copy)
o  changeset:   2:611948b1ec6a
|  tag:         default/beta
|  tag:         tip
|  tag:         beta
|  tag:         master
|  user:        test <test@example.org>
|  date:        Mon Jan 01 00:00:12 2007 +0000
|  summary:     add to beta
|
o  changeset:   1:7bcd915dc873
|  user:        test <test@example.org>
|  date:        Mon Jan 01 00:00:11 2007 +0000
|  summary:     add beta
|
@  changeset:   0:3442585be8a6
   tag:         alpha
   tag:         default/master
   user:        test <test@example.org>
   date:        Mon Jan 01 00:00:10 2007 +0000
   summary:     add alpha