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

Re: Merge back feature branch with old 1.4 server fails since TortoiseSvn 1.6.8

From: Lonnie <lonnieb_at_vmix.com>
Date: Mon, 4 Oct 2010 17:26:02 -0700 (PDT)

I went back to 1.6.7, and still had the problem. Then I remembered
that the last time I ran into this, I found a solution:

--> Check the "Ignore ancestry" box.

That solves it. Odd that you have to do that, however; agreed, in the
past it wasn't necessary.

Give it a try.


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

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