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

Re: trunk 'svn merge' takes a very long time to respond.

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 4 Dec 2012 10:14:08 -0500

On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hyrum_at_hyrumwright.org> wrote:

>> For your particular case, can you tell me what branch at what revision
>> your merge target was?
>
>
> The merge target was the ev2-export branch, which was probably most recently
> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
> reproduce, you could probably just back up the branch to before the most
> recent merge, and go from there.

Using the current HEAD of that branch I can see the same problem.
Been several minutes and still no merge output. Interesting that I do
not see this same problem with the fsfs-format7 branch. I wonder what
is different? Subtree mergeinfo?

Here is mergeinfo on the branch

$ svn mergeinfo ^/subversion/trunk
    youngest last repos.
    common full tip of path of
    ancestor merge branch branch

    1231318 1416744 1416980
    | | |
  -------| |------------ subversion/trunk
     \ \
      \ \
       --| |------------ subversion/branches/ev2-export
                       |
                       1416974

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2012-12-04 16:14:42 CET

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