<div class="gmail_quote">2012/5/30 Antonio Cuni <span dir="ltr"><<a href="mailto:anto.cuni@gmail.com" target="_blank">anto.cuni@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div id=":3nl">Another point of view is that IMHO porting the changes by doing merges is<br>
harder/more time consuming than porting them by hand.</div></blockquote></div><br>We probably don't have the same view on merges then :)<div>I consider that when a merge is successful (no conflict), it's a win.</div>
<div>And conflicts are markers to say "hey, port this change by hand".</div><div><br></div><div>Of course, it would be better if we could just merge the translator/ or jit/ directories on a regular basis,</div><div>
and come back later to merge (or port) changes from the interpreter/ and objspace/ directories.</div><div>But hg does not seem to allow this.</div><div><br></div><div>I estimate that I spent ~2h on each merge from default to py3k.</div>
<div>If one merge per month is enough, it's a task I can definitely find time for.</div><div><br></div><div>-- <br>Amaury Forgeot d'Arc<br>
</div>