Reviewing Merges

Giorgos Keramidas keramida at ceid.upatras.gr
Sun Mar 8 21:06:01 CDT 2009


On Sun, 8 Mar 2009 23:18:58 +0100, Johannes Stezenbach <js at sig21.net> wrote:
> Hi,
>
> one of the linux/drivers/media/ developers using the Mercurial
> repositories on linuxtv.org mentioned to me that it is too
> difficult to review merges.  I.e. after having reviewed
> and tested the changes, the maintainer pulls and merges.
> It should then be trivial for the developer to check that the
> merge went well (or if the maintainer botched it).
>
> Well, I thought that's easy, just use "hg view" (hgk) and
> click on the merge changeset, it does the right thing.
>
> But it turns out that:
> a) hgk isn't installed by default
> b) the merge review feature (i.e. suppression of uninteresting
>    changes in the merge changeset's diff) of hgk isn't documented
> c) there appears to be no easy way to do the equivalent without hgk
>    (i.e. on the command line or using the web interface)
>
> Or maybe I missed it, but I couldn't find anything with
> a web search or in the Wiki.

There's always the option of doing:

    hg diff -c REV | less

I very rarely use hgk these days, but I often use graphlog and the -c
option of diff :)



More information about the Mercurial-devel mailing list