Re: Conflicts under TSVN

Ron wrote:
> I am wondering what is the "correct" way to resolve conflicts when using
> TSVN.
>
> Three cases come up:
>
> 1) I need to resolve some conflicts with my version and the HEAD that
> was just pulled down. How do people do this? I tried using the GUI
> tools that TSVN brings up to allow you to select sections from on
> revision or another and this seems very cumbersome. Just finding the
> lines in my normal editor seems to work best.

Why is that cumbersome? You see the file as you had it in your working
copy on the top right, the file as it is in the repository HEAD on the
top left, and the result as it would be on the bottom.
Then you can go through the file, check each colored line in the bottom
view and there you can choose which lines you want to keep from which
version (your file or the HEAD file). Then you save the file, and you
click on the "resolve" button.

> 2) I want to junk my changes and just use the new file.

In the progress dialog (the one showing the update progress, also
showing you that a file got marked conflicted), right-click on the
conflicted entry and choose 'resolve conflict using "theirs"'

> 3) I want to junk the new file and just blindly use mine.

Same as above, but choose 'resolve conflict using "mine"'.

> There doesn't seem to be a quick way to do 2 or 3. Is there? If I want
> to junk my changes, I just delete my file (and the other 3 files the
> conflict created) and do a new update. This seems wrong.

Those menu's are also available in the "check for modifications" dialog.

> If I want to keep my changes, then I copy the .mine and mark it
> resolved. This works, but it's a lot of deleting and renaming, etc. Can
> TSVN just do this in one step?

Next time, please post to our users list and not the dev list for these
kind of questions.

Stefan

-- 
        ___
   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