annotate tests/test-merge6.out @ 1237:227cfbe34109
Fix off by one in convert-repo tags
--- crew.orig/contrib/convert-repo 2005-07-16 11:52:06.000000000 -0400
+++ crew/contrib/convert-repo 2005-09-02 02:58:14.000000000 -0400
@@ -86,9 +86,7 @@ class convert_git:
for f in os.listdir(self.path + "/.git/refs/tags"):
try:
h = file(self.path + "/.git/refs/tags/" + f).read().strip()
- p, a, d, m = self.getcommit(h)
- if not p: p = [h] # git is ugly, don't blame me
- tags[f] = p[0]
+ tags[f] = h
except:
pass
return tags
--
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
| author |
mason@suse.com |
| date |
Tue, 13 Sep 2005 19:32:43 -0500 |
| parents |
9344f5dd4488 |
| children |
ced2d3620f95 |
| rev |
line source |
|
616
|
1 pulling from ../B1
|
|
|
2 searching for changes
|
|
|
3 adding changesets
|
|
|
4 adding manifests
|
|
775
|
5 adding file changes
|
|
1043
|
6 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
616
|
7 (run 'hg update' to get a working copy)
|
|
|
8 bar should remain deleted.
|
|
993
|
9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
|
616
|
10 pulling from ../A2
|
|
|
11 searching for changes
|
|
|
12 adding changesets
|
|
|
13 adding manifests
|
|
775
|
14 adding file changes
|
|
1043
|
15 added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
616
|
16 (run 'hg update' to get a working copy)
|
|
|
17 bar should remain deleted.
|
|
990
|
18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
