Mercurial > hg > hg-git

annotate tests/test-pull-after-strip.out @ 358:b53421918a89 0.2.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup: bump version number
author Augie Fackler <durin42@gmail.com>
date Wed, 25 Aug 2010 15:45:46 -0500
parents eb345bacc1da
children 3f0f0c64f81c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 Initialized empty Git repository in gitrepo/.git/
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 Switched to a new branch "beta"
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 % clone a tag
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 importing Hg objects into Git
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 Counting objects: 3, done.
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 Total 3 (delta 0), reused 0 (delta 0)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 importing Git objects into Hg
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 @ changeset: 0:3442585be8a6
334
eb345bacc1da Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
Augie Fackler <durin42@gmail.com>
parents: 313
diff changeset
11 tag: alpha
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 tag: default/master
334
eb345bacc1da Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
Augie Fackler <durin42@gmail.com>
parents: 313
diff changeset
13 tag: master
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 tag: tip
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 user: test <test@example.org>
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 date: Mon Jan 01 00:00:10 2007 +0000
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 summary: add alpha
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 % clone a branch
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 importing Hg objects into Git
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 Counting objects: 6, done.
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 Compressing objects: 33% (1/3)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 Compressing objects: 66% (2/3)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 Compressing objects: 100% (3/3)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 Compressing objects: 100% (3/3), done.
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 Total 6 (delta 0), reused 0 (delta 0)
334
eb345bacc1da Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
Augie Fackler <durin42@gmail.com>
parents: 313
diff changeset
27 importing Git objects into Hg
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 @ changeset: 1:7bcd915dc873
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 | tag: beta
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 | tag: default/beta
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 | tag: tip
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 | user: test <test@example.org>
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 | date: Mon Jan 01 00:00:11 2007 +0000
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 | summary: add beta
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 |
334
eb345bacc1da Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
Augie Fackler <durin42@gmail.com>
parents: 313
diff changeset
37 o changeset: 0:3442585be8a6
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 tag: alpha
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 tag: default/master
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40 tag: master
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41 user: test <test@example.org>
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42 date: Mon Jan 01 00:00:10 2007 +0000
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
43 summary: add alpha
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46 pulling from git://localhost/gitrepo
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47 importing Hg objects into Git
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 Counting objects: 6, done.
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49 Compressing objects: 25% (1/4)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
50 Compressing objects: 50% (2/4)
313
a8b34be04b6a test-pull-after-strip: don't run git-cleanup twice
Tay Ray Chuan <rctay89@gmail.com>
parents: 300
diff changeset
51 Compressing objects: 75% (3/4)
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
52 Compressing objects: 100% (4/4)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
53 Compressing objects: 100% (4/4), done.
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 Total 6 (delta 0), reused 0 (delta 0)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55 importing Git objects into Hg
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56 abort: you appear to have run strip - please run hg git-cleanup
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
57 git commit map cleaned
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
58 % pull works after 'hg git-cleanup'
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
59 pulling from git://localhost/gitrepo
334
eb345bacc1da Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
Augie Fackler <durin42@gmail.com>
parents: 313
diff changeset
60 importing Hg objects into Git
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
61 Counting objects: 6, done.
334
eb345bacc1da Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
Augie Fackler <durin42@gmail.com>
parents: 313
diff changeset
62 Compressing objects: 25% (1/4)
298
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
63 Compressing objects: 50% (2/4)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
64 Compressing objects: 75% (3/4)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
65 Compressing objects: 100% (4/4)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
66 Compressing objects: 100% (4/4), done.
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
67 Total 6 (delta 0), reused 0 (delta 0)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
68 importing Git objects into Hg
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
69 (run 'hg update' to get a working copy)
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
70 o changeset: 2:611948b1ec6a
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
71 | tag: beta
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
72 | tag: default/beta
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
73 | tag: master
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
74 | tag: tip
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
75 | user: test <test@example.org>
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
76 | date: Mon Jan 01 00:00:12 2007 +0000
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
77 | summary: add to beta
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
78 |
6ad6945b6629 pull: make it possible to un-wedge the repo after stripping git revs
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
79 o changeset: 1:7bcd915dc873