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

Re: Why Merge-Tracking is disabled?

From: Paulo Eduardo Neves <pauloneves_at_gmail.com>
Date: Tue, 10 Mar 2009 12:23:41 -0700 (PDT)

On Mar 9, 3:41 pm, Harald Hoyer <haho..._at_t-online.de> wrote:
> Merged two branches, but merge tracking did not work. Couldn't find any
> reason.
> After desperate efforts I more or less accidentially used the "Only record
> the merge"-option. Now I could see an error message: "Merge from foreign
> repository is not compatible with mergeinfo modification".

I had a similar problem that was hard to discover why.

My work copy was referencing the repository http://localmachine/svn
and the merge was comming from http://localmachine.my.domain/svn


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-10 20:29:17 CET

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

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