Merge 'shelve' branch to trunk

[jul...@assembla.com]

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.

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.

Any thoughts?

- Julian

[Stefan]

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

 

[Julian Foad]

Stefan wrote:
> Julian wrote:
>> [...] Stefan suggested we should merge the 'shelve' branch to trunk [...]

> > 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.

Thanks. I have now merged Subversion 'shelve' branch to trunk. I will go
ahead and merge TSVN 'shelve' branch to trunk (with ext\Subversion
pointing to Subversion trunk), probably tomorrow.

- Julian

[Julian Foad]

Julian Foad wrote:
> I have now merged Subversion 'shelve' branch to trunk. I will go
> ahead and merge TSVN 'shelve' branch to trunk (with ext\Subversion
> pointing to Subversion trunk), probably tomorrow.

Merged to trunk in r28057.

On trunk, svn:externals for 'ext\Subversion' was pinned to
.../subversion/trunk@1805216; on the 'shelve' branch I had it floating
to the latest head revision.

Assuming you want to keep a pinned revision number there, I have now
pinned it to revision r1815228 (where 'shelve' was merged to trunk in
Subversion).

Please could you review the merge and check I didn't change anything
unintentional.

Thanks.
- Julian

[Stefan]

Looks good so far, haven't found anything that seems wrong.

Stefan

[Julian Foad]

Stefan via TortoiseSVN-dev wrote:
> Looks good so far, haven't found anything that seems wrong.

Thank you!

I had headaches trying to merge the .rc and resource.h files and also
the .pot file, as different tools had changed the comments in them.
Presumably your follow-up UTF-16-BOM fixes are related to that too.

Another question:

What is your policy for updating the svn:externals revision for
ext\Subversion? May I update it to a later revision whenever there is a
change in Subversion that I want to see in TSVN?

- Julian

[Stefan]

If it builds, you can update the svn external to HEAD any time you like.

If it doesn't build, you'll also have at least to make the build succeed - other changes can wait.

Stefan

 

- Julian

[Julian Foad]

Stefan via TortoiseSVN-dev wrote:
> If it builds, you can update the svn external to HEAD any time you like.
> If it doesn't build, you'll also have at least to make the build succeed
> - other changes can wait.

Perfect -- thanks!

- Julian