On Thu, Jan 31, 2013 at 11:04 PM, Jeroen Demeyer <jdeme...@cage.ugent.be> wrote: > On 2013-02-01 00:17, Robert Bradshaw wrote: >> On Thu, Jan 31, 2013 at 12:11 PM, Jeroen Demeyer <jdeme...@cage.ugent.be> >> wrote: >>> On 2013-01-31 20:42, Robert Bradshaw wrote: >>>> I think this will be much easier to do once we've moved to git >>> Why? What has git to do with this? >> >> Well, really moving to a proper revision control workflow, as dealing >> with broken patches and re-basing patches when trivial things like >> whitespace changes is way more painful in the current setup. > Are you saying that git automagically rebases patches for you when a > patch conflicts due to whitespace? If yes, that's very cool and perhaps > another plus for git. If no, then I don't see why rebasing conflicting > patches would be easier under the git workflow.
For whitespace specifically, there's git merge -s ignore-all-space. But for all sorts of changes I think that (1) Having an integrated repository means that it'll be *much* easier to do development at head, as well as on top of as-yet unmerged tickets (or for that matter both simultaneously). (2) There's no longer the manual tracking of which revision of Sage a given patch (should) cleanly apply to. (3) The process will be "git checkout ticket; git merge master; [manual conflict resolution]; git push ticket" rather than a messy copy-url, qimport, [manual conflict resolution] export, manually upload the patch with a note about where it applies (and also loosing history), and (4) Perhaps I could configure things differently, but littering my directory with reject files when things don't apply cleanly vs. git's inline <<<<<< OLD ... ======== ... >>>>>> NEW is so much easier to deal with (as well as being a lot safer in making sure nothing was omitted). Now there are cases where the [manual conflict resolution] is non-trivial, and it won't help there (assuming parity of git and mercurial's merge algorithms), but for big re-formatting efforts it's usually a trivial semantic merge surrounded by a bunch of manual labor that'll get easier. - Robert -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
