Hi Tomasz,
On Sat, Sep 05, 2015 at 08:30:09PM +0200, Tomasz Buchert wrote:
>
> I don't know to throw previous history either. What about this
> repo: https://anonscm.debian.org/cgit/debian-med/mothur.git/ ?
> I keep old history inside svn-debian and svn-upstream branches.
Ahh, I missed this branches. I'm not interested in svn-upstream, but if
you would merge svn-debian right into master that would be perfect.
> > continue with your commits later this would probably a good idea. So if
> > you agree I move your current mothur.git to mothur_new.git and do the
> > conversion first. You could then commit your later changes on top of
> > these. If you have good reasons to follow a different approach that
> > would be fine for me but please let us know these reasons. As I said it
> > would not be a real problem - I just want to make sure you are
> > proceeding intentionally this way.
>
> I did more or less the same thing as the script does (followind Alioth/git
> wiki).
> I imported the repo and git-svn created two branches (with debian directory
> and
> upstream sources). I renamed the tags to "svn/...". Then I pulled my work.
>
> The histories are separate, but I can think of rebasing my work on top
> of these two branches. I even tried, but failed a bit.
I have no experience with git-svn and I'm not sure how I could help
but it would be good if you would try harder to get svn-debian and
master merged.
> Please let me know what you think.
I think there is no point if I would follow my suggestion to convert
svn2git from scratch since you basically did so. There are two things
missing:
1. Change Vcs fields (which I just did, please `git pull`)
2. Droping a README.status at the old SVN location to inform
users about the move to Git. I'd volunteer to do so once
the history in master is OK.
Kind regards
Andreas.
--
http://fam-tille.de
