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

RE: Re: Conflict with merge

From: martin_praznovsky <martin.praznovsky_at_gmail.com>
Date: Thu, 2 May 2013 01:52:49 -0700 (PDT)

So I tried different version of server (1.5, 1.7) and it still creates a conflict.

But luckily found a solution: tried the same with svn command line commands and when the conflict should appear, it gives me this error:

svn: E195020: Cannot merge into mixed-revision working copy [2:4]; try updating first

And so, I did an update of the wc, then tried the merge again - and works (whether using cmd or Tortoise).

With Tortoise, before the update the Show Log shows both changes as eligible (they are not greyed out), after the update (which does not download any changes from server as there were none, but obviously is doing some magic on wc) the Show Log show only the second change as eligible (first is greyed out).

So easy solution, if you get conflict when merging, try to update wc first, then try to merge again.

Would be nice, if Tortoise shows some message as it is in cmd (like ...try updating first...), currently it displays a merge conflict and you don't know what to do...
(I know it is in SVN's best practices to do the updates, but anyway, when you got to situation like this and don't know how to solve it, it makes you crazy)

Regards,
Martin

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3054772

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-02 10:52:53 CEST

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