[Python-Dev] hg diff
Stephen J. Turnbull
stephen at xemacs.org
Tue Mar 8 11:30:42 CET 2011
"Martin v. Löwis" writes:
> > However, as Michael points out, you can have your tools generate the
> > patch. For example, it shouldn't be too hard to add a dynamic patch
> > generator to Roundup (although I haven't thought about the UI or the
> > CPU burden).
> For Mercurial, that's more difficult than you might expect. There is "hg
> incoming -p", but it has the nasty problem that it may produce
> multiple patches for a single file.
Doesn't "hg diff -r 'ancestor(branch,default)::branch'", where "branch"
is the unmerged branch you would like to inspect, do the right thing?
The revision function ancestor() gives the most recent common ancestor
of two revisions.
hg --version
Mercurial Distributed SCM (version 1.8)
More information about the Python-Dev
mailing list