[prev in list] [next in list] [prev in thread] [next in thread] 

List:       vcs-pkg
Subject:    RFC: converting SVN Debian packaging to Git
From:       sam () vilain ! net (Sam Vilain)
Date:       2007-10-15 0:18:23
Message-ID: 47129590.3050103 () vilain ! net
[Download RAW message or body]

martin f krafft wrote:
> Dear colleagues,
> 
> I (think I) finished my next post, this time importing a Debian
> package previously maintained in SVN into Git. Comments welcome.
> 
> Given I anticipate changes, I will not paste it into the mail this
> time.
> 
>   http://scratch.madduck.net/blog__drafts__2007.10.07_converting-a-package-to-git.rst

Martin,

I found this article great - suggestions and ideas abound of course, in
particular wrt to the merging - Linus did concede that this comments
only really applied to *automatic* merging, and that a file-history
based merge strategy might be useful for some users.  Also, I think that
it is important to get the attribution right with the final SVN import -
getting the authors map right, and making sure that any loose branches
that were merged into trunk are stitched into the right place.

For this bit:

  git branch -r | sed -rne 's, *tags/([^@]+)$,\1,p' | while read tag; do
    echo "git tag debian/$tag tags/${tag}^; git branch -r -d tags/$tag"
  done

  git branch -r | while read tag; do
    echo "git branch -r -d $tag"
  done


If you're just renaming tags en masse, I'd be tempted to just run
pack-refs and then edit .git/info/refs (iirc) directly with $EDITOR.

Again I think it's great that you're taking all this on ...

Sam.

[prev in list] [next in list] [prev in thread] [next in thread]