[Python-Dev] hg diff

[Daniel Stutzbach]

On Tue, Mar 8, 2011 at 6:30 PM, Éric Araujo <merwok at netwok.org> wrote:

> What’s the command you use with git?  Maybe someone will find the

Mercurial one.
>

Something like the following, assuming we're both working on branch "master"
to begin with.

git fetch their-repository master:experimental-branch
git diff master...experimental-branch

The idea is to pull their remote branch but not merge it, which will create
multiple heads locally.  Then find the common ancestor of my regular local
head and the new head, and diff the ancestor with the new head.

-- 
Daniel Stutzbach
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20110309/604ba687/attachment.html>