Reviewing Merges

Johannes Stezenbach js at sig21.net
Mon Mar 9 16:52:09 UTC 2009


Hi,

On Sun, Mar 08, 2009 at 10:56:02PM -0500, Steve Borho wrote:
> On Sun, Mar 8, 2009 at 5:18 PM, Johannes Stezenbach <js at sig21.net> wrote:
> >
> > 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.

Thanks for the pointer, but I did not ask for another
GUI, I'm happy with hgk.

"hg diff -c" is also not what I asked for. What I had
in mind is "hg diff --merge"...

("hg export --switch-parent" is also not what I want,
although it helps it's just not the same as the hgk diff)


One would think a VCS which makes frequent merges easy
would also give the user the tools to _easily_ verify that
the merge did not introduce any errors?


Thanks,
Johannes



More information about the Mercurial-devel mailing list