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

Re: FSFS format7 status and first results

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 21 Feb 2013 11:04:33 -0500

On Thu, Feb 21, 2013 at 5:05 AM, Stefan Fuhrmann
<stefan.fuhrmann_at_wandisco.com> wrote:

>> BTW, how are you managing your branch? I tried merging it back to
>> trunk to get an idea on the diff and there were a lot of text and tree
>> conflicts. I thought I had seen you doing synch merges from trunk in
>> the past so I assumed it would merge back.
>
>
> Hm. I split fsfs.c and .h into multiple files on the
> branch and the first merge from /trunk required
> significant manual intervention. Since that, merges
> have been clean because fsfs.* wasn't touched
> on /trunk.
>
> If I understand Julian's merge changes in 1.8,
> reintegrating should work because there has been
> no cherry picking etc.

I see this when using 1.8:

$ svn mergeinfo ^/subversion/branches/fsfs-format7
    youngest common ancestor
    | last full merge
    | | tip of branch
    | | | repository path

    1414755 1448697
    | |
       --| |------------ subversion/branches/fsfs-format7
      /
     /
  -------| |------------ subversion/trunk
                       |
                       1447423

It seems to imply that it does not think you have ever synched with
trunk. So maybe it is trying to replay every revision from your
branch when I merge back and that is why it gets so many conflicts?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2013-02-21 17:05:05 CET

This is an archived mail posted to the Subversion Dev mailing list.

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