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

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status