[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merging: Use Local and Use Repository

From: Tobias Jamin <tobias-jamin_at_gmx.de>
Date: Thu, 12 Nov 2009 15:02:03 -0800 (PST)

I toooooooootally agree with Jonathan!!!! Jonathans suggestion with renaming of the buttons with the actual behavior to "Prefer Local" and "Prefer Repository" is better than the actual situation but nevertheless I really really really need the options "Get Local" and "Get Repository" with the behavior described in the documentation.

So TortoiseSVN authors. I really appreciate to hear your opinion.

Apart from that: so many thanks for great Tortoise SVN :-)

Greetings from Germany,

Tobias Jamin

> During a merge when there are conflicts the conflict resolution dialog
> is shown. The options provided are "Use Local", "Use Repository",
> "Edit conflict", "Resolved", "Resolve later" and "Resolve all later".
>
> We have found the meaning of the first two options confusing - the
> "Use Local" and "Use Repository" options.
>
> Referring to the help documentation provided with TortoiseSVN 1.6.5
> didn't help. In section 4.20.7: "Handling Conflicts during Merge" we
> find:
>
> When a conflict occurs during the merge, you have three ways to
> handle it.
>
> 1. You may decide that your local changes are much more important,
> so you want to discard the version from the repository and keep
> your local version. Or you might discard your local changes in
> favour of the repository version. Either way, no attempt is made to
> merge the changes - you choose one or the other.
>
> 2. ...
>
> What this leads us to believe is that we are choosing the entirety of
> one file or the entirety of another. But we have found that this is
> only true for non-text files.
>
> What actually happens is that non-conflicting changes are merged in,
> but the conflicting changes are skipped. This is at odds with the
> statement in the help documentation "no attempt is made to merge the
> changes". The label text "Choose item:" next to these options on the
> dialog further adds to the confusion.
>
> In my opinion "Prefer Local" and "Prefer Repository" would make
> better button labels (when merging text files). The documentation
> could more clearly describe the actual behaviour. It may be worth
> considering having buttons for "Use Local" (keep the local file in
> its entirely) and "Prefer Local" (merge non-conflicting changes and
> prefer the local file for conflicting changes).
>
>
> The file involved was a project configuration file. We have now set
> the "svn:mine-type" property on the file so that "Use Local" and
> "Use Repository" buttons perform the expected actions.
>
> (Some people advocate not putting project configuration files in
> Subversion. This is not suitable for us because we are programming for
> an embedded system with important per-file options that must be set).
>
> Thank you for considering my feedback, and for TortoiseSVN itself,
>
> Jonathan Paton

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-13 00:58:30 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.