I just wanted to add: At least TortoiseSVN automatically uses the right revision (but only of files listed in the patch) and merges every file; about the default svn patch: I am not 100% sure as I never use that, because I need "a GUI for merging in milliseconds" ™ :-)
Uwe ----- Uwe Schindler H.-H.-Meier-Allee 63, D-28213 Bremen http://www.thetaphi.de eMail: u...@thetaphi.de > -----Original Message----- > From: Uwe Schindler [mailto:u...@thetaphi.de] > Sent: Saturday, December 01, 2012 10:18 AM > To: dev@lucene.apache.org; markrmil...@gmail.com > Subject: RE: Source Control > > Hi, > > > Even now, as I check out a revision in svn to apply an old patch, I'm > > amazed at how long i have to wait when it would be done in no time with > git. > > This is not true. With Subversion 1.7 this is automatically (and also with 1.6 > when using e.g. TortoiseSVN). If a patch is produced by "svn diff", you can > use "svn patch" to apply it and svn will take care of adds and applying the > changes to the right file version (fetched from network) while merging the > changes up to HEAD (with the standard merge conflict windows appearing as > needed). > > Uwe > > > On Tue, Nov 6, 2012 at 9:15 AM, Jack Krupansky > > <j...@basetechnology.com> wrote: > > > One issue is how to use git and github. One can certainly use it as > > > if it were svn, but that misses a lot of the power of git, > > > particularly the collaborative tools on github. > > > > > > For example, one approach is to create a branch for every Jira > > > ticket and then instead of posting raw "patches" on the Jira ticket, > > > create git "pull requests" from the branch, which make it easy to > > > comment on individual file changes, right down to comments on > > > individual lines of code. Changes can be "committed" and pushed to > > > the branch as work continues and new pull requests generated. > > > Eventually, pull requests can then be easily merged into the master, > > > as desired. Users can selectively include pull requests as they see fit as > well. > > > > > > But... can all of us, even non-committers do that? Or would the > > > better features of github be available only to committers? I don't > > > know enough about github to know whether you can have one class of > > > user able to create branches or comment on them but not merge into > > > master or tagged branches such as releases. > > > > > > -- Jack Krupansky > > > > > > > > > -----Original Message----- From: Mark Miller > > > Sent: Friday, October 26, 2012 7:02 PM > > > > > > To: dev@lucene.apache.org > > > Subject: Source Control > > > > > > So, it's not everyone's favorite tool, but it sure seems to be the > > > most popular tool. > > > > > > What are peoples thoughts about moving to git? > > > > > > Distributed version control is where it's at :) > > > > > > I know some prefer mercurial, but git and github clearly are taking > > > over the world. > > > > > > Also, the cmd line for git is a little eccentric - I use a GUI > > > client called SmartGit. Some very clever German's make it. > > > > > > A few Apache projects are already using git. > > > > > > I'd like to hear what people feel about this idea. > > > > > > - Mark > > > -------------------------------------------------------------------- > > > - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For > > > additional commands, e-mail: dev-h...@lucene.apache.org > > > > > > -------------------------------------------------------------------- > > > - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For > > > additional commands, e-mail: dev-h...@lucene.apache.org > > > > > > > > > > > -- > > - Mark > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For > > additional commands, e-mail: dev-h...@lucene.apache.org > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional > commands, e-mail: dev-h...@lucene.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
