On Saturday, September 24, 2011 7:34:14 PM Christian Müller wrote: > Hello Claus! > > Thank you for your work updating the WIKI page. I didn't know them... > > But I have to "stress" this topic a bit more, because I still have open > questions: > 1) Is it a problem when different committers use different merge tools (the > Java program, the Python script, simply Git, ...)?
the Java program just calls out to the python script so those are one in the same. The java program also has a "Record" option for the git case that will record that a merge was made without actually attempting the merge. Colm does this to me all the time in CXF. He uses git to cherry-pick merges. I just need to keep an eye on what he does and when I run DoMerges, I just "[R]ecord" his changes instead of merging them. > 2) What is our policy about backporting issues (only bugs, dependency > upgrades for bug fix versions, improvements, new features, dependency > upgrades which are not bug fix versions, ...)? I agree with Hadrians response. Nothing really to add. > 3) Still not clear why we backport many issues to 2.8.2 and not to 2.7.4. Time. Any help appreciated. :-) Dan > > I stess this to make it clear for everybody, document it and to provide a > better mentoring for new committers. > > Christian > > Sent from a mobile device -- Daniel Kulp dk...@apache.org http://dankulp.com/blog Talend - http://www.talend.com