User wrote:
> Stefan wrote:
>> You could ask the devs of kdiff3 to implement the resolving: just
>> deleting the three files you diff is enough.
>
> I don't think this has anything to do with kdiff3. I just use kdiff3 to solve
> the conflict and save the conflicted file using the same name. kdiff3 cleans
> up nicely.
>
> I just need to tell my working copy's .svn folder that I resolved the conflict.
> The sooner the better, so I don't forget which conflicts I have
> already resolved.
That's what I mean: to "tell my working copy that I resolved the
conflict", you can ask the kdiff3 devs to provide such a button. They
don't need to link against any Subversion lib for that. Simply deleting
the files Subversion created for the conflict (the *.mine *theirs or
*.rXXXX files) is enough. Subversion then knows that you resolved the
conflict.
> I tried again... right clicking on a conflicted red line in the update dialog
> shows the pop-up menu (both before and after resolving the conflict
> using kdiff3):
>
> [Compare with working copy]
> [Edit conflicts]
> [Resolve conflict using "theirs"]
> [Resolve conflict using "mine"]
> [Show Log]
>
> I am just suggesting that a [Resolved] option is available in this pop-up menu.
> The most logical would be if the [Resolved] option was first available when the
> user has clicked [Edit conflicts] or doubleclicked on the conflicted file (which
> is the same).
I'm sorry, but that's not a good idea. We provide TortoiseMerge for a
reason. There, you have the button to mark the file as resolved. A
"resolved" entry in that dialog (or any other context menu) could be
*very* bad if a user clicks on that entry without even having started
the merge/diff tool to resolve the conflict.
And the progress dialog (the one you see during long operations, like
"update") is the worst place to put such an entry.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jan 5 21:05:14 2006