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

     1

#!/bin/sh

     2

     3

cat <<'EOF' > merge

     4

#!/bin/sh

     5

echo merging for `basename $1`

     6

EOF

     7

chmod +x merge

     8

HGMERGE=./merge; export HGMERGE

     9

    10

mkdir A1

    11

cd A1

    12

hg init

    13

echo This is file foo1 > foo

    14

echo This is file bar1 > bar

    15

hg add foo bar

    16

hg commit -m "commit text" -d "0 0"

    17

    18

cd ..

    19

hg clone A1 B1

    20

    21

cd A1

    22

rm bar

    23

hg remove bar

    24

hg commit -m "commit test" -d "0 0"

    25

    26

cd ../B1

    27

echo This is file foo22 > foo

    28

hg commit -m "commit test" -d "0 0"

    29

    30

cd ..

    31

hg clone A1 A2

    32

hg clone B1 B2

    33

    34

cd A1

    35

hg pull ../B1

    36

hg update -m

    37

hg commit -m "commit test" -d "0 0"

    38

echo bar should remain deleted.

    39

hg manifest

    40

    41

cd ../B2

    42

hg pull ../A2

    43

hg update -m

    44

hg commit -m "commit test" -d "0 0"

    45

echo bar should remain deleted.

    46

hg manifest