<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#ffffff">
I believe you're running into <b>merge conflicts </b>with<b> the
parser changes </b>and/or<b> directory structure changes</b>.<br>
<br>
Because the old repo and the new repo aren't considered forks<br>
and because - strictly speaking - don't share any git history (every
historic commit was rewritten during the split-up),<br>
git can't do any of it's merging magic.<br>
So you're stuck with plain old patches (like in SVN) and <b>those
patches are stale</b>.<br>
<br>
Originally, the plan was that you just merge your old repository
until the last non-splitting up commit:<br>
<a class="moz-txt-link-freetext" href="https://github.com/droolsjbpm/droolsjbpm/tree/3e89a7afce9837517958a7069b0285def242b9cd">https://github.com/droolsjbpm/droolsjbpm/tree/3e89a7afce9837517958a7069b0285def242b9cd</a><br>
You 'll probably run into merge conflicts with the parser changes
too, but they might be easier to fix.<br>
Then create a patch from that, and apply it to the drools git
repository (probably with merge conflicts again).<br>
Drools-core/compiler were not stable (= runnable) when they were
split-up (so in that commit revision):<br>
Edson and Mark local branches had to applied on master to be
migrated and they collided.<br>
<br>
If your patch also applies on files outside directories drools-core
and drools-compiler, such as drools-api (now knowledge-api),
guvnor-webapp, etc<br>
then manually split up that patch file into 2 patch files.<br>
<br>
An alternative you can try, is fork on an old commit revision of
drools (note: the tags could not be migrated during the split-up):<br>
<a class="moz-txt-link-freetext" href="https://github.com/droolsjbpm/drools/commits/master?page=8">https://github.com/droolsjbpm/drools/commits/master?page=8</a><br>
then apply your patch on a branch of that and then merge HEAD to
that branch (which will give you those merge conflicts again, but
with git's merging magic).<br>
<br>
Sorry that I can't help more :( Stale patches sux.<br>
<br>
Op 03-04-11 09:27, Leonardo Gomes schreef:
<blockquote
cite="mid:BANLkTi==2FczGx5uYRS0Bj_Koq3=ODOkFQ@mail.gmail.com"
type="cite">Here's what I'm trying to do and haven't succeed so
far:<br>
<br>
<b>- Create a patch from my branch in droolsjbpm: </b><br>
<a moz-do-not-send="true"
href="https://github.com/droolsjbpm/droolsjbpm/commits/lr_unlinking_20101116">https://github.com/droolsjbpm/droolsjbpm/commits/lr_unlinking_20101116</a><br>
<br>
I forked, cloned and checked-out lr_unlinking_20101116. Then I
tried to different ways of generating a patch<br>
<br>
- git diff revision HEAD > myPatch.diff<br>
- git format-patch -k --stdout revision..HEAD > myPatch.patch<br>
<br>
<b>- Apply the patch to my fork of drools: </b><br>
<a moz-do-not-send="true"
href="https://github.com/leogomes/drools">https://github.com/leogomes/drools</a><br>
<br>
First let's have a look at the stats:<br>
- git apply --stat ../droolsjbpm/drools-core/myPatch.patch<br>
<br>
<br>
Then verify (and fail!):<br>
leo@leonardo-laptop:~/java/drools/git/drools/drools-core$ git
apply --check ../droolsjbpm/drools-core/myPatch.patch<br>
error: patch failed:
drools-core/src/main/java/org/drools/RuleBaseConfiguration.java:100<br>
error:
drools-core/src/main/java/org/drools/RuleBaseConfiguration.java:
patch does not apply<br>
(...)<br>
<br>
I'm trying first with drools-core and then have to do the same for
drools-compiler and api.<br>
<br>
Any hint or another approach to suggest?<br>
<br>
Thanks,<br>
Leo.<br>
<br>
<br>
<br>
<br>
<div class="gmail_quote">On Fri, Apr 1, 2011 at 9:12 AM, Geoffrey
De Smet <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:ge0ffrey.spam@gmail.com">ge0ffrey.spam@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt
0.8ex; border-left: 1px solid rgb(204, 204, 204);
padding-left: 1ex;">
<div text="#000000" bgcolor="#ffffff"> If you're building the
first time since the split-up, do take a look at the README
to avoid all kinds of pitfalls:<br>
<a moz-do-not-send="true"
href="https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/README.md"
target="_blank">https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/README.md</a><br>
It also talks about using UTF-8 encoding, unix (\n) line
endings (in non-java files too), ...<br>
<br>
Op 01-04-11 08:49, Leonardo Gomes schreef:
<div>
<div class="h5">
<blockquote type="cite">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.<br>
<br>
Thanks, Geoffrey.<br>
<br>
<br>
<div class="gmail_quote">On Thu, Mar 31, 2011 at 7:02
PM, Geoffrey De Smet <span dir="ltr"><<a
moz-do-not-send="true"
href="mailto:ge0ffrey.spam@gmail.com"
target="_blank">ge0ffrey.spam@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt
0pt 0pt 0.8ex; border-left: 1px solid rgb(204,
204, 204); padding-left: 1ex;">
<div text="#000000" bgcolor="#ffffff"> <br>
<br>
Op 31-03-11 17:25, Leonardo Gomes schreef:
<div>
<blockquote type="cite">Hello Guys,<br>
<br>
I didn't actually followed-up on all emails
about the Git repository, but I think that
it should be simple.<br>
<br>
<b>Problem:</b><br>
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. <br>
I modified: drools-api, drools-core,
drools-compiler.<br>
<br>
<b>Solution:</b><br>
- Fork <a moz-do-not-send="true"
href="https://github.com/droolsjbpm/droolsjbpm-knowledge"
target="_blank">https://github.com/droolsjbpm/droolsjbpm-knowledge</a>
for the drools-api changes<br>
and <a moz-do-not-send="true"
href="https://github.com/droolsjbpm/drools"
target="_blank">https://github.com/droolsjbpm/drools</a>
for the others (core and compiler).<br>
<br>
</blockquote>
</div>
and clone your forks<br>
<blockquote type="cite">- Manually apply my
patches</blockquote>
locally, and then commit and push to your forks<br>
<blockquote type="cite">, create a pull request.<br>
</blockquote>
2 probably, one for each repository<br>
but yes, that should work :)
<div><br>
<blockquote type="cite"><br>
Is that correct? Anything else to keep in
mind?<br>
</blockquote>
</div>
<blockquote type="cite"> <br>
Thanks,<br>
Leonardo.<br>
<br>
<br>
<br>
<pre><fieldset></fieldset>
_______________________________________________
rules-dev mailing list
<a moz-do-not-send="true" href="mailto:rules-dev@lists.jboss.org" target="_blank">rules-dev@lists.jboss.org</a>
<a moz-do-not-send="true" href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a>
</pre>
</blockquote>
<br>
<pre cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</div>
<br>
_______________________________________________<br>
rules-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:rules-dev@lists.jboss.org"
target="_blank">rules-dev@lists.jboss.org</a><br>
<a moz-do-not-send="true"
href="https://lists.jboss.org/mailman/listinfo/rules-dev"
target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
<br>
</blockquote>
</div>
<br>
<pre><fieldset></fieldset>
_______________________________________________
rules-dev mailing list
<a moz-do-not-send="true" href="mailto:rules-dev@lists.jboss.org" target="_blank">rules-dev@lists.jboss.org</a>
<a moz-do-not-send="true" href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a>
</pre>
</blockquote>
<br>
<pre cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</div>
</div>
</div>
<br>
_______________________________________________<br>
rules-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a><br>
<a moz-do-not-send="true"
href="https://lists.jboss.org/mailman/listinfo/rules-dev"
target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
<br>
</blockquote>
</div>
<br>
<pre wrap="">
<fieldset class="mimeAttachmentHeader"></fieldset>
_______________________________________________
rules-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a>
<a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/rules-dev">https://lists.jboss.org/mailman/listinfo/rules-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</body>
</html>