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

Re: How to resolve between working copies?

From: Bo Berglund <bo.berglund_at_gmail.com>
Date: Mon, 17 Feb 2020 10:33:59 +0100

On Mon, 17 Feb 2020 10:10:53 +0100, Stefan Sperling <stsp_at_elego.de>

>> So what can I do to get rid of this problem?
>First, you should put the file back on disk :)
>Moving files away behind the back of SVN is never a good idea.

Yes, but the file was a non-versioned duplicate so it should not
matter that I renamed it, right.
Anyway I put it back since it did not solve my problem.

>Then run 'svn resolve' again. When you are unsure what to choose, the option
>to "merge" the files should be the best one. It will boil down 'add vs add'
>to a text-conflict or perhaps even a clean merge, depending on file content.

I have never even seen the resolve command before...

>There are more options (try the 'h' option to see them), but generally
>any "merge" options in the conflict resolver will always produce a useful
>result when possible.
>Hope this helps!

Yes it does, thank you!
Running svn resolve got me a chance to fix the problem.
Since I could not see any difference in the command line svn diff I
proceeded to merge etc and then I used tortoise to diff the result and
found that tywo lines had an extra space at the end, something WinDiff
does not consider a difference...

Now I could finally svn rm the file since it did not belong there in
the first place, moved into a php dir instead.

Bo Berglund
Developer in Sweden
Received on 2020-02-17 10:34:08 CET

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

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