Hm, I thought it's not a conflict unless there are *three* versions. However, Jason's suggestion is correct: instead of writing a new tool for this purpose, we should leverage existing tools. Cool! I can focus on writing transformations.
On 12/15/06, Jason Orendorff <[EMAIL PROTECTED]> wrote: > On 12/15/06, Anders J. Munch <[EMAIL PROTECTED]> wrote: > > GvR wrote: > > > > > > Finally, I have a dream: a GUI that will let you do this > > > interactively, sort of like query-replace in Emacs. But this message > > > is already too long, so I'll stop for now. Thanks for reading this > > > far. :-) > > > > Sounds like a job for revision control conflict resolution editors. > > Generate output that looks like a conflict: > > > > <<<<<<< .python2x > > apply(f, x, y) > > ======= > > f(*x, **y) > > >>>>>>> .python3 > > Excellent idea! > > This leads to a funny conclusion, actually. These days I have source > control everywhere. I review most changes in an edit-capable differ > before checking in. So my diff tools are already all set up for > reviewing changes (and making further changes during a review, like > adding comments). > > So get this: Guido's dream is already implemented on my system! Give > me the "--destructively-modify-in-place" option and I'll be all set. > :) > > -j > _______________________________________________ > Python-3000 mailing list > [email protected] > http://mail.python.org/mailman/listinfo/python-3000 > Unsubscribe: > http://mail.python.org/mailman/options/python-3000/guido%40python.org > -- --Guido van Rossum (home page: http://www.python.org/~guido/) _______________________________________________ Python-3000 mailing list [email protected] http://mail.python.org/mailman/listinfo/python-3000 Unsubscribe: http://mail.python.org/mailman/options/python-3000/archive%40mail-archive.com
