Hi, On Sun, 9 Jul 2006, Pavel Roskin wrote: > Hello, Dscho! > > On Sat, 2006-07-08 at 18:42 +0200, Johannes Schindelin wrote: > > This is just an update for people being interested. Alex and me were > > busy with that project for a few days now. While it has progressed nicely, > > there are quite a couple TODOs in merge-recursive.c, just search for "TODO". > > That's great. Just a few notes regarding the patch. > > Why do you list "recur" twice in all_strategies in the git-merge.sh? > The second "recur" should probably be "recursive". This is just make really, really sure that recursive is not tested, but recur. I would be laughed at if I sent a patch for recur and tested in on recursive, claiming the patch was fine, right? Besides, when recur is fixed (for the TODOs as well as for obscure test cases), there will be no change to git-merge.sh and git-rebase.sh, because recur will be the new recursive. > Test for Python in the git-rebase.sh is probably wrong. "recur" doesn't > need Python - that's the whole point. In fact, if I build git with > NO_PYTHON, TEST fails in t3401-rebase-partial.sh Again, I am not concerned about simple bugs as this right now. I want to fix the big things first. Biggest thing right now: reimplement the whee^H^H^H^Hread-tree with -i, -m, and no option. > - variable declarations in the middle of the code (allowed by c99 but > not by ANSI C) and incomplete function declarations (no "void"). It's > not C++, let's stick to the C standards. >From my experience with Java, I know that this declaration in the middle of the code can make debugging much easier. That is why they are still there. Like Junio said, once the thing is close to finished, we can fix these. > I'm attaching a patch that fixes everything except variable > declarations. May I ask you a favour? Can you redo the patch in, say, two weeks? Thank you! > It would be great to have a patch that actually removes the old > "recursive" and makes the new strategy "recursive". I understand it's > the plan, right? Yes, sir. Ciao, Dscho - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html