Svn 1.10 branch

[Julian Foad]

Will TortoisSVN trunk follow the svn 1.10.x branch or svn trunk or both?

In January I updated the TortoiseSVN's 'ext/Subversion' external
revision to point to the Svn trunk revision just before 1.10.x was
branched, and don't know where to go next from there.

- Julian

[Stefan]

Usually we switch to the stabilizing branch of svn when it's time for a release, and then we stay there for a while before switching back to the svn trunk.
Or do we need to stay with the svn trunk for the shelving feature?

[Julian Foad]

Stefan via TortoiseSVN-dev wrote:
> Usually we switch to the stabilizing branch of svn when it's time for a
> release, and then we stay there for a while before switching back to the
> svn trunk.

OK.

> Or do we need to stay with the svn trunk for the shelving feature?

On the 1.10.x branch the shelving feature exists in its basic "version
1" form. On trunk it is more developed, with multiple versions per shelf
giving "checkpointing".

- Julian

[Stefan]

> Or do we need to stay with the svn trunk for the shelving feature?

On the 1.10.x branch the shelving feature exists in its basic "version
1" form. On trunk it is more developed, with multiple versions per shelf
giving "checkpointing".

Will these changes get merged back before the 1.10 release?
I really like to make a TSVN release linked to an official svn release.
Nightly builds of TSVN linking to the svn trunk is fine though...

Stefan
 

[Julian Foad]

Stefan wrote:
>> > Or do we need to stay with the svn trunk for the shelving feature?
>>
>> On the 1.10.x branch the shelving feature exists in its basic "version
>> 1" form. On trunk it is more developed, with multiple versions per shelf
>> giving "checkpointing".
>
> Will these changes get merged back before the 1.10 release?

1.10.0 will be released from the 1.10.x branch, and only critical fixes and doc fixes will be merged into it before then.

> I really like to make a TSVN release linked to an official svn release.
> Nightly builds of TSVN linking to the svn trunk is fine though...

Sounds good to do both.

Will you make a Tsvn 1.10(.0) stabilization branch, or have a feature freeze instead?

- Julian

[Stefan]

Sounds good to do both.

Will you make a Tsvn 1.10(.0) stabilization branch, or have a feature freeze instead?

I'll create a TSVN 1.10.x branch a few days before the svn release.

btw: still need your osdn.net account name if you want commit access.

Stefan

[Julian Foad]

Stefan via TortoiseSVN-dev wrote:
> I'll create a TSVN 1.10.x branch a few days before the svn release.

In that case it seems to me that we should make TSVN trunk point to the
tip of SVN 1.10.x branch, as soon as possible. (Last time I looked,
which was when I last updated it in January, it pointed to the common
ancestor of SVN trunk and SVN 1.10.x.)

Later, some time after you branch TSVN 1.10.x, then we should update
TSVN trunk to point to SVN trunk again.

Right?

- Julian