On Tue, Dec 4, 2012 at 10:14 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> 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?
Merge finished just as I hit Send:
$ time svn merge ^/subversion/trunk
--- Merging r1416745 through r1416980 into '.':
U subversion/libsvn_wc/wc-queries.sql
U subversion/libsvn_wc/wc_db_update_move.c
--- Recording mergeinfo for merge of r1231319 through r1416980 into '.':
U .
real 3m46.879s
user 0m0.228s
sys 0m0.071s
Did not see any of those notifications until the last 1 second. So it
was about 3:45 of silence.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2012-12-04 16:15:48 CET