Reviewing incoming changesets

[Steve Borho]

On Thu, Oct 15, 2009 at 10:42 AM, Steve Borho <steve at borho.org> wrote:
> On Thu, Oct 15, 2009 at 9:47 AM, Yannick Gingras <ygingras at ygingras.net> wrote:
>>
>> Hi,
>>  I'm trying to improve our development pipeline with systematic code
>> reviews before cross branch (or cross developer) merges.  One thing
>> that I would like to do is to export a compound diff of all the
>> changesets that I get in `hg inc otherbranch`, but only for source
>> code.
>>
>> I'm pretty sure that I will have to roll out my own extension for that
>> but there might be something out there that does most of what I want.
>> Any recommendations?
>
> If you have a visual diff tool configured with extdiff, you can do
> this fairly easily:
>
> hg vdiff -r branch1 -r branch2
>
> The TortoiseHg changelog tool makes this a bit easier to do, since it
> allows you to show diffs between any two arbitrary revisions.

The above vdiff example only works if you are using named branches
within the same repository.  If you meant 'clone branch', then you
have a few other options:

hg pull otherbranch
hg vdiff -r . -r tip
hg rollback # if you do not want to accept the branch changs

TortoiseHg 0.9 (not quite released yet), has a very nice feature that
seems directly tailored to your work-flow.  The changelog tool allows
you to do 'hg inc otherbranch --bundle foo.hg', which stores the
incoming changesets into a bundle file.  It then "mounts" the bundle
on the repository so you can preview what it will look like when
pulled.  You can view each changeset, visual diff ranges, etc.. until
you either accept or reject the bundle.  It even allows you to pull
changes up to a specific revision.

THG 0.9 is scheduled for release on Nov 1, and nightly builds are
available from the download page if you're curious.

--
Steve Borho

PS: Today is our feature freeze, we would love it if people would try
out the nightly builds and report any problems they find.