So, back to the git worktree plan? I had it mostly working before switching to this approach. If $SAGE_ROOT is /path/to/sage-7.4, it checks out to a sibling folder /path/to/sage-7.4_merge_tree. Automating it is a bit more complicated though; if the merge fails and the user has to correct it manually, you either need a separate command to pull back into the main repository or a way to detect this situation. David
On Sun, Nov 20, 2016 at 5:09 AM, Volker Braun <vbraun.n...@gmail.com> wrote: > Thats a wrong-way merge and is confusing if one ever wants to understand > the history of the ticket. The convention is that the feature branch is > first, and you merge in dependencies. > > > > On Sunday, November 20, 2016 at 2:31:57 AM UTC+1, David Roe wrote: >> >> I've implemented a new git-trac command at https://github.com/sagemath/gi >> t-trac-command/pull/26. I ended up not using git worktree at all. >> Instead, the command creates a new branch from develop, and merges in the >> changes from the old branch. I know that there's been some discussion that >> merging develop can screw up the git log but I haven't followed the >> details. If this approach is problematic for some reason, please let me >> know. >> David >> >> On Sat, Nov 19, 2016 at 2:12 PM, David Roe <roed...@gmail.com> wrote: >> >>> >>> >>> On Sat, Nov 19, 2016 at 7:12 AM, Jeroen Demeyer <jdem...@cage.ugent.be> >>> wrote: >>> >>>> On 2016-11-19 11:23, David Roe wrote: >>>> >>>>> I mean that even if I checkout develop again before building Sage, it >>>>> still takes a long time. >>>>> >>>> >>>> You mean something like >>>> >>>> - checkout old branch (but don't build it) >>>> - checkout new branch >>>> - build Sage >>>> >>>> That's a known issue, but it's certainly not Sage-specific. It happens >>>> because git doesn't track timestamps. >>> >>> >>> Certainly. I'm just suggesting that we add a command to git-trac to >>> make this operation less painful. >>> David >>> >>> >>>> >>>> >>>> -- >>>> 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+...@googlegroups.com. >>>> To post to this group, send email to sage-...@googlegroups.com. >>>> Visit this group at https://groups.google.com/group/sage-devel. >>>> For more options, visit https://groups.google.com/d/optout. >>>> >>> >>> >> -- 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 https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
