prevent accidental use of "Ignore ancestry"

Hi,

I'd like to bring this up here, since it was causing trouble for us
already several times and cause very hard to correct and trace-down
follow-up issues.

This issue occurs, if some developer mistakenly (by accident) clicks the
"ignore ancestry" checkbox in th TSVN merge dialog and doesn't recognize
his mistake. This seems to be quite easy to happen (for us it happened
to three different developers in the past year).

It's kind of problematic, because it will lead to mergeinfos not being
correctly set anymore in situations where you work with more than one
branch (f.e. having branch A, B, C where B and C are branches of A and
developers merge changes between B and C, having ignore ancestry set
leads to missing mergeinfos for changes merged from branch A).

It's causing more trouble, since the incorrect setting is hardly
noticeable and can stay like that for months without being noticed. At
that point you'll have to review all the merges of that developer to
trace down missing mergeinfos which is a horrific amount of work.

Hence I'd suggest to move the ignore ancestry setting into a separate
sub dialog which users need to explicitly click on. Concrete suggestion:

current dialog:

Proposed different dialog:

Clicking the new button ("Advanced settings...") would open a new dialog
with at least the "Ignore ancestry" setting having been moved there. It
might be worthwhile moving some of the other settings to that dialog as
well.
I'm thinking here:
- Force the merge
- Do reintegrate instead of automatic merge (old style)

Also in light of the upcoming SVN 1.10 which will introduce the new
conflict resolver and provide means to automatically handle tree
conflicts, I believe that more users of TSVN might eventually use merges
throughout different branches, since the most problematic situation
(move-detection/-handling) will be a lot improved in that SVN version.
That will certainly lead to more cases where people run into the
described problem above.

What do you think?

-- 
Regards,
Stefan Hett, Developer/Administrator
EGOSOFT GmbH, Heidestrasse 4, 52146 Würselen, Germany
Tel: +49 2405 4239970, www.egosoft.com
Geschäftsführer: Bernd Lehahn, Handelsregister Aachen HRB 13473
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3205203
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].