On Wed, Dec 11, 2013 at 8:53 AM, Julian Elischer wrote:
> On 12/11/13, 8:24 AM, Eitan Adler wrote:
>>
>> On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem
>> wrote:
>>>
>>> Hi,
>>>
>>> I just tried to MFC into stable/10 and it worked, but with
>>> a lot of mergeinfo. I know diddly about svn, so is th
On 12/11/13, 8:24 AM, Eitan Adler wrote:
On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem wrote:
Hi,
I just tried to MFC into stable/10 and it worked, but with
a lot of mergeinfo. I know diddly about svn, so is this ok?
Starting with stable/10 and later you must merge into the *root*, not into s
Eitan Adler wrote:
> On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem
> wrote:
> > Hi,
> >
> > I just tried to MFC into stable/10 and it worked, but with
> > a lot of mergeinfo. I know diddly about svn, so is this ok?
>
> Starting with stable/10 and later you must merge into the *root*, not
> into s
On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem wrote:
> Hi,
>
> I just tried to MFC into stable/10 and it worked, but with
> a lot of mergeinfo. I know diddly about svn, so is this ok?
Starting with stable/10 and later you must merge into the *root*, not into sys/.
P.S., with svn, it can be very
Hi,
I just tried to MFC into stable/10 and it worked, but with
a lot of mergeinfo. I know diddly about svn, so is this ok?
Here's the "svn diff":
Index: sys
===
--- sys (revision 259205)
+++ sys (working copy)
Property changes on: s
