Thanks Aaron. The VCS I had in mind was Mercurial. I'm not sure
about the other VCSes, but in Mercurial, it's common to refer to a
changeset with two parents. I think a 3-way diff would be the ideal
mechanism here.
On Apr 30, 2:28 pm, Aaron Sherman wrote:
> You're using the term "two parents"
I'm not sure this helps, but when you publish a review request and
then update the review request with a new changeset it will diff again
against the previous diff. Each update/publish produces a delta that
you can follow. However, publishing does email the groups/users,
which you may not want.
On Friday 30 April 2010 10:52:53 pm Andrew wrote:
> Hi all. Is there any support for reviewing merges (changesets with
> two parents)? I imagine that ideally, it would be a review request
> that has two diffs -- one against the first parent and the other
> against the second parent.
I guess you'
You're using the term "two parents" very liberally. I don't know of a
version control system that sees merges in this way. Every node in a
repository has, in my experience across a wide variety of systems, one
parent. It might have merge history that involves other sources (in any
system that track
