Re: Conflict with merge

On 30.04.2013 11:22, martin_praznovsky wrote:
> Hi,
> we are using SVN on our project and found something tricky. When performing a merge we are getting a conflict, although we think there shouldn't be. Here a procedure how to get the conflict:

[snip]

> 8) now we want to merge again the change, but this time on diferent folder level. Trying to do a merge to Trunk/AnotherFolder/YetAnotherFolder from Branch/AnotherFolder/YetAnotherFolder. Right click YetAnotherFolder in Trunk/AnotherFolder, TortoiseSVN->Merge...->Merge a range of revisions. URL is url to Branch/AnotherFolder/YetAnotherFolder, in Show log I can see creation and 2 changes (why 2, if it was already merged ?!?), I choose those 2 changes, try to perform the merge but get a conflict!
>
> Trying to resolve I see this diffs:
> Theirs: lineYY
> Mine: lineXX

You chose both revisions, even though one of those revisions was already
merged. That's why you get the conflict.

> Why do we get those errors when merging first on "parent" folder and then merging on some "child" folder? Causing us big problems... Is it a Tortoise bug?
>
>
>
> Client info:
> TortoiseSVN 1.7.12, Build 24070 - 64 Bit , 2013/03/29 08:00:43
> Subversion 1.7.9,
> apr 1.4.6
> apr-utils 1.3.12
> neon 0.29.6
> OpenSSL 1.0.1e 11 Feb 2013
> zlib 1.2.7
>
> Server: version 1.5.6

And that's the main reason: your server is way too old and doesn't
support merge tracking. If you had a newer server (>= 1.6), the second
merge would succeed since svn would know that one of the revisions you
selected for the merge was already merged and it would not try to merge
that revision again.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3054659
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].