Hi,
I am trying to move an old CVS repository into a git-repository. The CVS
repository contains a lot of modules and I would like to put all these
modules into a single git-repository. I saw the earlier e-mail on the
subject and tried using the subdir parameter to the CVS source which
seemed to work (see attached tailor.conf).
However, all the modules in the CVS repository have tags. Some of the
tags are used for all modules (the tags typically represent releases and
each release consists of code from several modules). When I try to run
the conversion, tailor exits with the following message:
12:59:23 [I] /lhome/mattias/nobackup/cvs-to-git/tailor-one-git $ git tag
-a -m BL6 BL6 HEAD
12:59:23 [W] [Status 1]
12:59:23 [C] Couldn't replay changeset
12:59:23 [I] 1 pending changesets in state file
12:59:23 [C] Upstream change application failed
Failure applying upstream changes:
/lhome/mattias/nobackup/cvs-to-git/tailor-one-git $ git tag -a -m BL6
BL6 HEAD returned status 1
If I try to run the offending command manually I get:
[EMAIL PROTECTED]:~/nobackup/cvs-to-git/tailor-one-git$ git tag -a -m BL6
BL6 HEAD
tag 'BL6' already exists
I guess the following happens: tailor starts with the first module,
processes all the changesets and sets the correct tags. Then it moves on
to the second module and tries to set the same tag again. This fails.
Is there any way around this?
Regards
Mattias Holmlund
[DEFAULT]
root-directory=/lhome/mattias/nobackup/cvs-to-git/tailor-one-git
patch-name-format=None
[acc]
source=cvs:acc
target=git:acc
state-file=acc.state
start-revision=INITIAL
[cvs:acc]
repository=:pserver:[EMAIL PROTECTED]/cvs/new-sw
module=acc
subdir=acc
encoding=iso-8859-1
[git:acc]
[adt]
source=cvs:adt
target=git:adt
state-file=adt.state
start-revision=INITIAL
[cvs:adt]
repository=:pserver:[EMAIL PROTECTED]/cvs/new-sw
module=adt
subdir=adt
encoding=iso-8859-1
[git:adt]
[alarm]
source=cvs:alarm
target=git:alarm
state-file=alarm.state
start-revision=INITIAL
[cvs:alarm]
repository=:pserver:[EMAIL PROTECTED]/cvs/new-sw
module=alarm
subdir=alarm
encoding=iso-8859-1
[git:alarm]
[ark-switch]
source=cvs:ark-switch
target=git:ark-switch
state-file=ark-switch.state
start-revision=imported
[cvs:ark-switch]
repository=:pserver:[EMAIL PROTECTED]/cvs/new-sw
module=ark-switch
subdir=ark-switch
encoding=iso-8859-1
[git:ark-switch]
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
