Raymond Hettinger writes:
> Does hg's ability to "make merges easier than svn" depend on having
> all the intermediate commits? I thought the theory was that the smaller
> changesets provided extra information that made it possible to merge
> two expansive groups of changes.
Tim Delaney's ex
Apologies the top-posting (damned Gmail ...).
Tim Delaney
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Possibly. A collapsed changeset is more likely to have larger hunks of
changes e.g. two changesets that each modified adjacent pieces of code get
collapsed down to a single change hunk - which would make the merge
machinery have to work harder to detect moved hunks, etc.
In practice, so long as ea
On Dec 13, 2012, at 7:00 PM, Chris Jerdonek wrote:
> On Thu, Dec 13, 2012 at 6:48 PM, R. David Murray
> wrote:
>> On Thu, 13 Dec 2012 20:21:24 -0500, Trent Nelson wrote:
>>>- Use a completely separate clone to house all the intermediate
>>> commits, then generate a diff once
Am 13.12.2012 18:09, schrieb andrew.svetlov:
> http://hg.python.org/cpython/rev/9347869d1066
> changeset: 80840:9347869d1066
> user:Andrew Svetlov
> date:Thu Dec 13 19:09:33 2012 +0200
> summary:
> Issue #16049: add abc.ABC helper class.
>
> Patch by Bruno Dupuis.
>
> files:
