Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Why Merge-Tracking is disabled?

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: Why Merge-Tracking is disabled?

Author neves
Full name Paulo Eduardo Neves
Date 2009-03-10 12:23:42 PDT
Message On Mar 9, 3:41 pm, Harald Hoyer <haho...@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

« Previous message in topic | 5 of 5 | Next message in topic »

Messages

Show all messages in topic

Why Merge-Tracking is disabled? hahoyer Harald Hoyer 2009-03-09 11:41:42 PDT
     Re: Why Merge-Tracking is disabled? levyam Andy Levy 2009-03-09 13:05:43 PDT
     Re: Why Merge-Tracking is disabled? steveking Stefan Küng 2009-03-09 13:38:16 PDT
         Re: Why Merge-Tracking is disabled? leak Kurt Pruenner 2009-03-09 14:11:59 PDT
     Re: Why Merge-Tracking is disabled? neves Paulo Eduardo Neves 2009-03-10 12:23:42 PDT
Messages per page: