Reviewing Merges
Steve Borho
steve at borho.org
Sun Mar 8 22:56:02 CDT 2009
On Sun, Mar 8, 2009 at 5:18 PM, 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.
There is also:
http://bitbucket.org/tortoisehg/stable/wiki/hgtk
I think hgtk log does a better job than hgk with merge
changesets. It allows you to toggle between the diffs to
both parents.
--
Steve Borho
More information about the Mercurial-devel
mailing list