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

RE: [TSVN] Suggestion: Keep the Update dialog open in case of Conflicted files

From: Amir Kolsky <amir_at_xpandsoft.com>
Date: 2005-04-15 08:43:01 CEST

Thanks for the response. I'll check the settings to see why the dialog
closes automatically. Just to clarify, I want it to stay open only if there
were conflicts during the update. It would have been extremely useful at
that point to be able to 'View Conflicted Files Only', from that dialog.

As for the delete, let me explain the use case I had in mind: we have common
binary files checked into the repository that are the result of different
solutions' build. So I might build A.DLL from A.SLN and use it in B.SLN.
Now, not everyone needs to build A.SLN so they can get A.DLL from a common
location. If someone rebuilt A.SLN and committed, A.DLL would have been
changed, and it will be refreshed in the next update. If I have also changed
A.DLL then we'll run into a conflict. This conflict can not be solved by a
merge, as we are not dealing with text here. The solution is to:
  Locally delete (or revert) the conflicted file and all conflict-related
junk (i.e. Resolve Conflict),
  Update, and
This will make A.DLL changed with respect to HEAD rather than conflicted,
and life can go on.

How do you propose to do this?

Is it possible to add an SVN property that will prompt TSVN to
revert-resolve-update (i.e. use HEAD) and then do something with the useless
file (e.g., delete it and then show in a special status (e.g.
Binary-Conflicted) that the user must do something to rebuild the file? What
I'm trying to save is the time taken to hunt down all these binary

Sorry for being less than clear earlier, I hope the motivation is clearer

 Amir Kolsky
XP& Software

>-----Original Message-----
>From: SteveKing [mailto:steveking@gmx.ch]
>Sent: Thursday, April 14, 2005 10:40 PM
>To: dev@tortoisesvn.tigris.org
>Subject: Re: [TSVN] Suggestion: Keep the Update dialog open in
>case of Conflicted files
>Amir Kolsky wrote:
>> I must be doing something wrong here...
>Just a little, not much ;)
>> Either my suggestions are increadibly stupid.
>Not stupid, but it's hard to understand them.
>> Or they are already there, and I haven't noticed.
>> Or I'm being ignored...
>Since there are so many mails on this list, I usually only
>answer those which I think I can answer best. But most mails
>can be answered by many other people on this list too, so I
>leave those to them - after all, I have to work on TSVN...
>> *Subject:* [TSVN] Suggestion: Keep the Update dialog
>open in case of
>> Conflicted files
>The progress dialog already stays open. If it closes for you
>automatically, then check your settings, the main tab.
>> Wait, that's not all. Once you click on a conflicted
>file you will
>> be given the options to:
>> 1. Edit conflicts (using the usual tools)
>Already there.
>> 2. Resolve conflicts
>Resolve conflict would mark the file which is in conflict as
>resolved, but wouldn't resolve the conflict itself. And that's
>something really nobody wants! That file has the conflict
>markers inserted by Subversion and is therefore 'corrupt'.
>> 3. Use update copy (in effect: delete and reUpdate).
>Use "edit conflicts", right-click in TMerge, choose "use whole
>file", save.
>> I find it the most convenient to deal with problems in a
>> concentrated fashion. These suggestions would let me deal
>> effectively with the two types of conflicts: Text (via
>the edit and
>> resolve) and Binary (via the 'use updated copy').
>> If a file or directory or something should have been
>erased by the
>> update but were not (because they were updated since the previous
>> update) allow me to
>> 4. Delete
>Deleting a file? Without you having checked (opened that file
>first) if it's important?
>> 5. Move
>To where? Moving files is really something you should use the
>explorer for, not TSVN.
>> 6. Rename.
>That too, you can do that with the explorer much better.
>> Finally, it would be very useful to have an Open Containing
>> Workspace (Folder) option that will allow me to directly
>reach the
>> affected files.
>Now *that* something I could do.
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.tigris.org
>To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Apr 15 07:43:51 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.