Re: Even more merge thoughts...

>> - The Merge dialog contains the helpful hint "To merge all revisions,
>> leave the box empty.".
...
>> Maybe it would be a good idea to add a checkbox that says something
>> like "Merge all revisions", that is checked by default and hides/grays
>> out the rest of the "Revision range to merge" controls.
...
> Can you please open an issue for this?

Done.

> Just note that this is an enhancement and therefor will have to wait
> until 1.8.0.

Of course.

>> - In the Merge dialog when the "Show log" button is clicked, the Log
>> dialog that opens will list revisions as far back as it can.
...
> But there's an advanced option to find the start revision of the
> branch in these situations:
> Settings->Advanced->LogFindCopyFrom - set to true
> But please be aware that this doesn't work for Google Code repositories
> (see here for why: http://code.google.com/p/support/issues/detail?id=5471
> ), and for other repositories it can take a long time to find that revision.
> That's why it's disabled by default.

Too bad. Well. I guess we'll have to wait until SVN gets support for "copied to" in addition to the "copied from" to make this kind of queries efficient. (Answer the question of "in what revisions have the trunk been branched".)

>> Then there's the topic of "Test merge". I have more or less stopped
>> using it since it does not really provide any time benefit, and the
>> predicted conflicts are mostly greatly exaggerated. Is there really no
>> way to make the test merge more accurate when it comes to predicting
>> conflicts?
> You'd have to ask that on the svn mailing list.
> But I think it's not possible without actually executing the merge.

Thought so*2. The strange thing is that (at least it feels like) it is about as slow as a complete merge... Wellwell, not really an important issue.

>> - When a Test merge is performed, I would suggest changing from the
>> red "conflicted" to an orange "potential conflict", to highlight that
>> this is only an assumed conflict.
> Good idea. Could you please file an issue for this as well?

Done.

Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2889561

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-01 09:12:14 CET