From: Julian S. <sim...@gm...> - 2014-01-23 05:12:52
|
On 23 January 2014 13:40, Kent R. Spillner <ksp...@ac...> wrote: > SourceForge changed their Subversion repository URL scheme since we last > imported the history with git-svn. Because of the way git-svn works this > means we can't import the most recent commits on top of the existing > commits. > > So, we have two choices*: > 1). Import the entire history again into a new branch, and then merge > that into master > 2). Import the entire history again into a new branch, then reset master > to be the new branch > > #1 will cause duplicate commits to be recorded in the git history up to > the point of the last import (last August). #2 means existing clones & > forks will break, and need to resync with the new master branch. > > Beither choice is very good. :( > > Does anyone have a strong preference between the two? Personally, I vote > #2 because I think the duplicate history will be really confusing, and > given how quiet we've been recently I doubt anyone has done much work in > their git clones. :) > This is my second choice. > > * Ok, there's a third choice, too: manually replay the most recent commits > into the git repo, kill the Subversion repo, and require all new > development happen in git. I'm not opposed to this, but given the lack of > activity these past several months I don't know if everyone has had an > opportunity to get comfortable with Git & GitHub. > > This is my first choice. J. > > ------------------------------------------------------------------------------ > CenturyLink Cloud: The Leader in Enterprise Cloud Services. > Learn Why More Businesses Are Choosing CenturyLink Cloud For > Critical Workloads, Development Environments & Everything In Between. > Get a Quote or Start a Free Trial Today. > > http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk > _______________________________________________ > Cruisecontrol-devel mailing list > Cru...@li... > https://lists.sourceforge.net/lists/listinfo/cruisecontrol-devel > -- Julian Simpson Neo Technology/The Build Doctor Auckland, NZ +6422 157 9103 |