On 05/09/15 18:19, Andreas Tille wrote: > Hi Tomasz, > > thanks for your work on mothur which is really appreciated. I noticed > that you started a new Git repository that is ignoring the previous work > done in SVN. I admit I'm not very keen on the history in SVN but I > managed to convert quite some SVN repositories to Git using a helper > script[1] and I see now reason to throw away the history without good > reason. So if you want me to do the Git conversion first and you Hi Andreas, 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. > 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. > > Kind regards > > Andreas. > Please let me know what you think. Cheers, Tomasz > [1] https://anonscm.debian.org/viewvc/debian-med/trunk/helper-scripts/convert_svn_2_git?view=markup > > -- > http://fam-tille.de >
Attachment:
signature.asc
Description: Digital signature