[Python-Dev] Long term development external named branches and periodic merges from python

[Nick Coghlan]

It's published as part of the tracker repo, although I'm not sure exactly
where it lives.

--
Nick Coghlan (via Gmail on Android, so likely to be more terse than usual)
On Nov 29, 2011 6:50 AM, "Jesus Cea" <jcea at jcea.es> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 28/11/11 06:06, Nick Coghlan wrote:
> >> So, in this context, if the tracker "create patch" diff from
> >> BASE, it is not "safe" to merge changes from mainline to the
> >> branch, because if so "create patch" would include code not
> >> related to my work.
> >
> > No, "Create Patch" is smarter than that. What it does (or tries to
> > do) is walk back through your branch history, trying to find the
> > last point where you merged in a changeset that it recognises as
> > coming from the main CPython repo. It then uses that revision of
> > the CPython repo as the basis for the diff.
>
> Oh, that sounds quite the right way. Clever.
>
> > So if you're just working on a feature branch, periodically
> > pulling from hg.python.org/cpython and merging from default, then
> > it should all work fine.
>
> So, my original question is answered as "yes, you can merge in changes
> from mainline, and 'create patch' will work as it should".
>
> Good!!. Thanks!!!.
>
> >> Anybody knows the mercurial command used to implement "create
> >> patch"?.
> >
> > It's not a single command - it's a short script MvL wrote that
> > uses the Mercurial API to traverse the branch history and find an
> > appropriate revision to diff against.
>
> Publish out somewhere would be useful, I guess. This is a problem I
> have found in a few other projects. I can see even a modifier for "hg
> diff" for a future mercurial version :-).
>
> Could be implemented as a command line command using "revsets"?.
> Propose a new revset to mercurial devels?
>
> - --
> Jesus Cea Avion                         _/_/      _/_/_/        _/_/_/
> jcea at jcea.es - http://www.jcea.es/     _/_/    _/_/  _/_/    _/_/  _/_/
> jabber / xmpp:jcea at jabber.org         _/_/    _/_/          _/_/_/_/_/
> .                              _/_/  _/_/    _/_/          _/_/  _/_/
> "Things are not so easy"      _/_/  _/_/    _/_/  _/_/    _/_/  _/_/
> "My name is Dump, Core Dump"   _/_/_/        _/_/_/      _/_/  _/_/
> "El amor es poner tu felicidad en la felicidad de otro" - Leibniz
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iQCVAwUBTtPze5lgi5GaxT1NAQIT9gP+N4urbw7TgCWTa7EFZ4rjj7/o9f3aBq4I
> kYBnVZGmh98YqjHL0MzHhhu2a+G6pC/Zksf9CyIinPol4DJR8zGhBDIxo6SNIja+
> QsSyQ7DhBWkSwKZAKqBNSdBBH0fu/DpdmNv6fP0s04Ju6sllvHAbEN/oj9zWqxWM
> KjAMzrgPcSA=
> =zViH
> -----END PGP SIGNATURE-----
> _______________________________________________
> 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/ncoghlan%40gmail.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20111129/87477405/attachment.html>