Here's what I'm trying to do and haven't succeed so far: *- Create a patch from my branch in droolsjbpm: * https://github.com/droolsjbpm/droolsjbpm/commits/lr_unlinking_20101116
I forked, cloned and checked-out lr_unlinking_20101116. Then I tried to different ways of generating a patch - git diff revision HEAD > myPatch.diff - git format-patch -k --stdout revision..HEAD > myPatch.patch *- Apply the patch to my fork of drools: * https://github.com/leogomes/drools First let's have a look at the stats: - git apply --stat ../droolsjbpm/drools-core/myPatch.patch Then verify (and fail!): leo@leonardo-laptop:~/java/drools/git/drools/drools-core$ git apply --check ../droolsjbpm/drools-core/myPatch.patch error: patch failed: drools-core/src/main/java/org/drools/RuleBaseConfiguration.java:100 error: drools-core/src/main/java/org/drools/RuleBaseConfiguration.java: patch does not apply (...) I'm trying first with drools-core and then have to do the same for drools-compiler and api. Any hint or another approach to suggest? Thanks, Leo. On Fri, Apr 1, 2011 at 9:12 AM, Geoffrey De Smet <ge0ffrey.s...@gmail.com>wrote: > If you're building the first time since the split-up, do take a look at > the README to avoid all kinds of pitfalls: > > https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/README.md > It also talks about using UTF-8 encoding, unix (\n) line endings (in > non-java files too), ... > > Op 01-04-11 08:49, Leonardo Gomes schreef: > > I managed to fork/clone and get diffs from everything I did, but I still > need to install Maven 3 and make it coexist with Maven 2 to be able to > compile and test. Should be applying the patches later today, hopefully. > > Thanks, Geoffrey. > > > On Thu, Mar 31, 2011 at 7:02 PM, Geoffrey De Smet <ge0ffrey.s...@gmail.com > > wrote: > >> >> >> Op 31-03-11 17:25, Leonardo Gomes schreef: >> >> Hello Guys, >> >> I didn't actually followed-up on all emails about the Git repository, but >> I think that it should be simple. >> >> *Problem:* >> I would like to manually apply the changes that I did into >> lr_unlinking_20101116 branch (+ some other changes I didn't commit yet) to >> the newly split repositories. >> I modified: drools-api, drools-core, drools-compiler. >> >> *Solution:* >> - Fork https://github.com/droolsjbpm/droolsjbpm-knowledge for the >> drools-api changes >> and https://github.com/droolsjbpm/drools for the others (core and >> compiler). >> >> and clone your forks >> >> - Manually apply my patches >> >> locally, and then commit and push to your forks >> >> , create a pull request. >> >> 2 probably, one for each repository >> but yes, that should work :) >> >> >> Is that correct? Anything else to keep in mind? >> >> >> Thanks, >> Leonardo. >> >> >> >> >> _______________________________________________ >> rules-dev mailing >> listrules-dev@lists.jboss.orghttps://lists.jboss.org/mailman/listinfo/rules-dev >> >> >> -- >> With kind regards, >> Geoffrey De Smet >> >> >> _______________________________________________ >> rules-dev mailing list >> rules-dev@lists.jboss.org >> https://lists.jboss.org/mailman/listinfo/rules-dev >> >> > > _______________________________________________ > rules-dev mailing > listrules-dev@lists.jboss.orghttps://lists.jboss.org/mailman/listinfo/rules-dev > > > -- > With kind regards, > Geoffrey De Smet > > > _______________________________________________ > rules-dev mailing list > rules-dev@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/rules-dev > >
_______________________________________________ rules-dev mailing list rules-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/rules-dev
