incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: Issue with merging release with trunk
Date Fri, 28 Dec 2012 23:47:14 GMT
I did a full checkout of trunk, and merge no longer gave that error but it
took so long it timed out.  There were tons of mustella updates because we
did all of the mustella test fixing in develop branch.

I think the right thing to do is for me to try to merge in the mustella
folder (maybe in chunks if it can't handle it) then see what else is
missing.

Somebody should revert the unintended checkins to trunk.  I can do it if
nobody else wants to.

-Alex


On 12/26/12 10:06 PM, "Alex Harui" <aharui@adobe.com> wrote:

> I've gotten timeouts on vcc/default during updates and checkouts.  I think
> that is a different issue and a known bug in svn.
> 
> This error seems different, so not sure what the issue is.
> 
> 
> On 12/26/12 10:00 PM, "Justin Mclean" <justin@classsoftware.com> wrote:
> 
>> Hi,
>> 
>>> I got the same error trying to do an svn update.
>> 
>> I was about to do a full check out of both trunk and develop with no issues
>> over a slow link, but the merge dry run gave that error. I've not seen the
>> issue before.
>> 
>> It seem to happen at random times, ie some times it would get further than
>> others with the merge. Perhaps we should raise an infra JIRA bug?
>> 
>> Thanks,
>> Justin

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message