[Python-Dev] devguide: Basic instructions on how to generate a patch with hg for non-committers.

[Michael Foord]

On 07/02/2011 14:28, Antoine Pitrou wrote:
> On Mon, 07 Feb 2011 13:27:31 +0000
> Michael Foord<fuzzyman at voidspace.org.uk>  wrote:
>> On 07/02/2011 12:25, Georg Brandl wrote:
>>> Am 07.02.2011 00:21, schrieb Nick Coghlan:
>>>> On Mon, Feb 7, 2011 at 6:53 AM, Brett Cannon<brett at python.org>   wrote:
>>>>> I would rather not have new hg users have to install an extension just
>>>>> to get a simple workflow going.
>>>> I may still keep my Rdiff-based FAQ entry around as an example of how
>>>> to get a collapsed diff regardless of personal workflow, though.
>>>>
>>>> Installing Rdiff was actually pretty easy, and I get the impression
>>>> that becoming comfortable with adding the extensions that suit your
>>>> personal workflow is a key part in getting Mercurial to really work
>>>> for you. We won't do people any favours if we try to pretend that
>>>> isn't the case.
>>> This is quite true.  (And after a while, the same goes for creating your
>>> own extensions, BTW.)
>>>
>> And from the description it sounds like rdiff will be very useful for
>> our usecase.
> I'm not sure it is really. When you commit multiple changesets
> locally you really want to use something like named branches or mq to
> track them. Advocating rdiff is advocating something SVN-like, it's not
> very helpful IMO.
>

Although often you want to merge in a single commit and erase the commit 
history of the branch you worked in (as discussed previously). So are 
you advocating rebasing before merge as the alternative?

Michael

> Regards
>
> Antoine.
>
>
> _______________________________________________
> Python-Dev mailing list
> Python-Dev at python.org
> http://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe: http://mail.python.org/mailman/options/python-dev/fuzzyman%40voidspace.org.uk


-- 
http://www.voidspace.org.uk/

May you do good and not evil
May you find forgiveness for yourself and forgive others
May you share freely, never taking more than you give.
-- the sqlite blessing http://www.sqlite.org/different.html