:06 AM
To: Eric Yang
Cc: Chris Douglas , Eric Yang , Arun
Suresh , Sunil G , Hadoop Common
Subject: Re: Missing some trunk commit history
We actually already did:
https://lists.apache.org/thread.html/43cd65c6b6c3c0e8ac2b3c76afd9eff1f78b177fabe9c4a96d9b3d0b@1440189889@%3Ccommon
>> > > > Regards,
> >> > > > Eric
> >> > > >
> >> > > > On 12/14/17, 12:06 PM, "Arun Suresh" <
> asur...@apache.org>
> >> > wrote:
> >>
st for feature branches is to
maybe
>> > squash
>> > > merge -
>> > > > this way we see it as a single commit ? Although we
will
>> > loose
>> > > the featu
> wrote:
>> > > >
>> > > > Another option - atleast for feature branches is to maybe
>> > squash
>> > > merge -
>> > > > this way we see it as a single commit ? Although we will
>> > loose
>
> > > > Cheers
> > > > -Arun
> > > >
> > > > On Thu, Dec 14, 2017 at 11:32 AM, Eric Yang <
> > > ey...@hortonworks.com>
t; loose
> > > the feature
> > > > branch history (I am ok with that though)
> > > >
> > > > Cheers
> > > > -Arun
> > > >
> > > > On Thu, Dec 14, 2017 at 11:32 AM, Eric Yang <
erge are done
> using
> > rebase +
> > > > merge. This is the reason that timeline is out of order.
> > > >
> > > > Would it be more useful to merge without rebasing for
> feature
> > branch merge
>
nk failure was due to
> merge or some
> > > recent commits.
> > >
> > > Regards,
> > > Eric
> > >
> > > From: Sunil G
> > > Date: Thursday, December 14, 201
merge without rebasing for feature
> branch merge
> > > to avoid timeline confusions? The argument for not rebasing,
> it would be
> > > easier to find the root cause of trunk failure was due to
> merge or some
> > > rece
> > easier to find the root cause of trunk failure was due to merge or
some
> > recent commits.
> >
> > Regards,
> > Eric
> >
> > From: Sunil G
> > Date: Thursday, December 14, 2017 at 1
> From: Sunil G
> > Date: Thursday, December 14, 2017 at 11:11 AM
> > To: Eric Yang
> > Cc: Hadoop Common
> > Subject: Re: Missing some trunk commit history
> >
> > Hi Eric.
> >
> > A branch merge has ha
> easier to find the root cause of trunk failure was due to merge or some
> recent commits.
>
> Regards,
> Eric
>
> From: Sunil G
> Date: Thursday, December 14, 2017 at 11:11 AM
> To: Eric Yang
> Cc: Hadoop Common
> Sub
trunk failure was due to merge or some
> recent commits.
>
> Regards,
> Eric
>
> From: Sunil G
> Date: Thursday, December 14, 2017 at 11:11 AM
> To: Eric Yang
> Cc: Hadoop Common
> Subject: Re: Missing some trunk commit history
>
> Hi Eric.
>
> A branch m
the root cause of trunk failure was due to merge or some recent commits.
Regards,
Eric
From: Sunil G
Date: Thursday, December 14, 2017 at 11:11 AM
To: Eric Yang
Cc: Hadoop Common
Subject: Re: Missing some trunk commit history
Hi Eric.
A branch merge has happened during that time, and hence you
Hi Eric.
A branch merge has happened during that time, and hence you might have seen
some old commits from that branch. If you go down further, you could see
those commits.
Copied from my git log:
commit 40b0045ebe0752cd3d1d09be00acbabdea983799
Author: Weiwei Yang
Date: Wed Dec 6 17:52:41 201
15 matches
Mail list logo