Hi,
> Those files that were already changed probably aren't in the commit for the
> merge since there were no diffs.
But as they were initially modified their history would of been carried over
into the release branch when I created it, so don't think we've lost any
history.
Justin
On 12/28/12 9:09 PM, "Justin Mclean" wrote:
> Hi,
>
>> Did you revert the trunk checkins that shouldn't have been checked in?
>
> No just overrode anything in conflict with the release version, everything
> should of been in develop/release anyway. (ie same changes checked in twice)
Well, it
Hi,
> Did you revert the trunk checkins that shouldn't have been checked in?
No just overrode anything in conflict with the release version, everything
should of been in develop/release anyway. (ie same changes checked in twice)
Justin
On 12/28/12 6:14 PM, "Justin Mclean" wrote:
> Hi,
>
>> I did a full checkout of trunk, and merge no longer gave that error but it
>> took so long it timed out.
> Looks like if you check out on people.a.o it works, I'll do a merge, check in
> and tag. Anything that in conflict I'll take the the
Hi,
> I did a full checkout of trunk, and merge no longer gave that error but it
> took so long it timed out.
Looks like if you check out on people.a.o it works, I'll do a merge, check in
and tag. Anything that in conflict I'll take the the release version (there a
few things).
Thanks,
Justin
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 chun
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" wrote:
> Hi,
>
>> I got the same error trying to do an svn update.
>
>
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 th
I got the same error trying to do an svn update. I am checking out trunk
now which seems to be working. Then I'll try merge again, but it may not
finish before I stop for the night.
On 12/26/12 9:50 PM, "Nicholas Kwiatkowski" wrote:
> I'm getting the same error at the moment. It is possible
I'm getting the same error at the moment. It is possible that something is
screwed up at Apache's SVN again. I get this error every few weeks for a
few hours.
-Nick
On Wed, Dec 26, 2012 at 4:48 PM, Justin Mclean wrote:
> Hi,
>
> Can someone be kind enough to run this from the base of a clean
10 matches
Mail list logo
