ignite-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Boudnik <...@apache.org>
Subject Re: Patch validation on TC
Date Sat, 28 Feb 2015 07:55:30 GMT
Alexey,

not picking up on you - just was working with this ticket hence the example.

Did you rebase your branch on top of origin/sprint-2 before generating the
patch? Ie
    git rebase origin/sprint-2
possibly followed conflict resolving...

Thanks,
  Cos

On Sat, Feb 28, 2015 at 02:46PM, Alexey Kuznetsov wrote:
> IGNITE-187 was fixed by me.
> I created patch as: git format-patch origin/sprint-2 --stdout >
> ignite-187.patch
> 
> On Sat, Feb 28, 2015 at 2:34 PM, Konstantin Boudnik <cos@apache.org> wrote:
> 
> > Looks like I have stepped on (the same?) issue that everybody else. I have
> > checked out the repo;
> >
> >     % git clone --depth 1
> > https://git1-us-west.apache.org/repos/asf/incubator-ignite.git
> >     % gco -b spint-2 origin/sprint-2
> >     % git am ../IGNITE-187.patch
> >
> > and got this
> > Applying: IGNITE-187 Refactoring of node attributes.
> > error: patch failed:
> > modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java:500
> > error:
> > modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java:
> > patch does not apply
> > Patch failed at 0001 IGNITE-187 Refactoring of node attributes.
> > When you have resolved this problem run "git am --resolved".
> > If you would prefer to skip this patch, instead run "git am --skip".
> > To restore the original branch and stop patching run "git am --abort".
> >
> > Now, I'd like to figure out a couple of things, so I can move forward:
> >  - how the patches are prepared: what is the _exact_ command being used
> >  - are they cut after dev. branch is rebased over current integration
> > branch, sprint-2 I presume?
> >  - is anyone else is seeng the same issues?
> >
> > Appreciate the input as it will help me to move forward with patch
> > validation. Thanks
> >   Cos
> >
> > On Wed, Feb 25, 2015 at 06:51AM, Konstantin Boudnik wrote:
> > >
> > > Dmitriy just mentioned to me that there some issues with patch
> > application. I'd
> > > happy to help if someone explains to me what seems to be the problem.
> > Are the
> > > issues arising because the patch has conflicts? Cause it might be a bit
> > > difficult to resolve such conflicts: using git or svn merge is usually a
> > way
> > > more friendly. But the hurdle can be overcome using IDEA or similar
> > systems.
> > >
> > > One of the recipes for troubles is when patch is generated and then
> > applied
> > > with different prefix depth. E.g. git diff usually does something like
> > >         a/file
> > >         b/file
> > > When such patch is applied from the top-level directory of the project
> > one
> > > needs to specify '-p1' option for patch commands. However if you are
> > using 'git
> > > format-patch' for patch creation then simple 'git am' should be
> > sufficient
> > > assuming the patch doesn't have any conflicts.
> > >
> > > I don't believe patch size might be an issue, but would love to be
> > pointed out
> > > to the next trouble shall it happens.
> > >
> > > --
> > > Take care,
> > >   Cos
> > >
> >
> 
> 
> 
> -- 
> Alexey Kuznetsov
> GridGain Systems
> www.gridgain.com

Mime
View raw message