RetroSearch Browse

Thu Dec 30 20:57:11 CET 2010 · http://mail.python.org/pipermail/python-dev/2010-December/107134.html

Hi,

One thing confuses me in this thread: Do the problems come from merging
across different versions (i.e. different syntax and module names), or
are they regular problems that come up because people don’t want to use
a merge tool?  I for one immensely like Mercurial’s merge and utterly
dislike Subversion’s (certainly because I’ve learned a good merge tool
and don’t have a good editor to handle files with conflict markers).

> There is surely a better way to work with maintenance branches!
> PEP374 suggests to first modify the oldest release, but this does not
> seems right to me (I have three reasons in mind)
Can you give them?

Regards

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from http://mail.python.org/pipermail/python-dev/2010-December/107134.html below:

[Python-Dev] Backport troubles with mercurial