[Python-Dev] CPython hg transition complete

[Antoine Pitrou]

Beside Martin's answer, you might want to read:
http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
or perhaps:
http://hginit.com/

Regards

Antoine.


Le dimanche 06 mars 2011 à 14:46 -0600, skip at pobox.com a écrit :
> Antoine> Yes, there is. You can simply push to your 3.2 repo instead:
> 
>     Antoine> $ cd 3.1
>     Antoine> $ hg up 3.1    # just in case
>     Antoine>  # hack, compile, test
>     Antoine> $ hg ci -m "Issue #xxx: nasty bug now fixed"
>     Antoine> $ hg push ../3.2
>     Antoine> $ cd ../3.2
>     Antoine> $ hg up 3.2    # just in case
>     Antoine> $ hg merge 3.1
>     Antoine>  # compile, test, optionally resolve conflicts
>     Antoine> $ hg ci -m "Merge fix for issue #xxx"
> 
> Thanks.  I don't understand what the "hg merge 3.1" does.  You already
> pushed from 3.1 to ../3.2 then updated in 3.2.  Didn't that make the changes
> available?
> 
> Skip
>