[Kde-scm-interest] cvs2svn converted tag created from branch

Thiago Macieira thiago at kde.org
Sat Mar 13 16:19:06 CET 2010


Em Sábado 13. Março 2010, às 06.39.52, Niko Sams escreveu:
> On Sat, Mar 13, 2010 at 15:08, Thiago Macieira <thiago at kde.org> wrote:
> > Em Sábado 13. Março 2010, às 00.57.57, Niko Sams escreveu:
> >> Hi,
> >> 
> >> I still working on quanta conversion and need some advice (Thiago?) on
> >> this commit:
> >> http://websvn.kde.org/?view=revision&revision=212623
> >> 
> >> The thing is tag 3.1.0 has been created from branch 3.1, but cvs2svn did
> >> this by copying /trunk, removing unneded stuff and copying the
> >> individual files from 3.1.
> >> 
> >> Very simplified rules that show just this problem are below, they can
> >> be run very quickly with
> >> --resume-from 190000 --max-rev 200000
> > 
> > I don't see any way of doing that in svn2git because the history is
> > actually wrong in SVN, from the way that svn2git looks at it.
> 
> ok, too bad :(
> 
> > I'd recommend that you do the import as-is and fix it up in Git later.
> 
> /me as a git noob could need some hints on how to do this best...

If it's a pure tag (i.e., tagged and never moved, which CVS tags usually are), 
then all you need to do is delete the tag from Git once the conversion is 
complete and retag the correct commit from the 3.1 branch.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20100313/7270285c/attachment.sig 


More information about the Kde-scm-interest mailing list