On Tuesday, November 14, 2017 at 4:06:35 PM UTC+1, (unknown) wrote: > > In the "Two installers for 'standard' TortoiseSVN and Shelving version​" > thread, Stefan suggested we should merge the 'shelve' branch to trunk, as > it is a new feature ready for user testing and should not affect the > stability of other features. > > I thought I should post a specific message to be clear about it. > > If no-one objects, I will go ahead. I originally said I'd get on with it > right away but then realized it will take a bit longer, probably a whole > day, as I first have to get the svn source code up to coding standards and > merge that to its trunk. >
I think that's the best solution. That way, the TSVN nightly builds will have this included and can be tested there as well. > > An alternative approach Stefan suggested is to first merge TortoiseSVN > 'shelve' branch to trunk and point 'ext\Subversion' to the Subversion > 'shelve' branch for the time being, until I get it merged to Subversion > trunk. That seems not quite right so I am not so keen on that. > > If you can merge the shelving code to the svn trunk, I think then that's not needed anymore. Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN-dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/a3831c21-27d8-4b18-9360-09c5c57c8a0a%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
