'Re: How to review a merge?'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: How to review a merge?
From:       Kevin Bullock <kbullock+mercurial () ringworld ! org>
Date:       2013-09-04 13:52:23
Message-ID: 5CBCAE1A-8445-4497-A090-17363F181503 () ringworld ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]

On 4 Sep 2013, at 12:11 AM, Dirk Heinrichs wrote:

> Am Dienstag, 3. September 2013, 18:43:42 schrieb Harvey Chapman:
> 
> > I'd like to review a merge, but I'd like to review it the same way it's
> > shown when merging, i.e. with window panes for LOCAL, BASE, REMOTE, and
> > OTHER. Is this possible?
> 
> Why? To review a merge you only need to diff the result against the previous 
> commit.

Diffs _by definition_ cannot fully represent a merge: they are only the differences \
between one parent and the changeset in question.

But you can use the 'extdiff' extension to do this: it supports expanding both \
parents in the arguments to an external program. See `hg help -e extdiff`. Note that \
I haven't tried this myself—we should probably add an example of how to do this to \
`hg help extdiff`.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

[Attachment #5 (unknown)]

<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; \
-webkit-line-break: after-white-space; "><div><div>On 4 Sep 2013, at 12:11 AM, Dirk \
Heinrichs wrote:</div><br class="Apple-interchange-newline"><blockquote \
type="cite"><div>Am Dienstag, 3. September 2013, 18:43:42 schrieb Harvey \
Chapman:<br><br><blockquote type="cite">I'd like to review a merge, but I'd like to \
review it the same way it's<br></blockquote><blockquote type="cite">shown when \
merging, i.e. with window panes for LOCAL, BASE, REMOTE, \
and<br></blockquote><blockquote type="cite">OTHER. Is this \
possible?<br></blockquote><br>Why? To review a merge you only need to diff the result \
against the previous <br>commit.<br></div></blockquote><div><br></div><div>Diffs _by \
definition_ cannot fully represent a merge: they are only the differences between one \
parent and the changeset in question.</div><div><br></div><div>But you can use the \
'extdiff' extension to do this: it supports expanding both parents in the arguments \
to an external program. See `hg help -e extdiff`. Note that I haven't tried this \
myself—we should probably add an example of how to do this to `hg help \
extdiff`.</div></div><br><div> <span class="Apple-style-span" style="border-collapse: \
separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; \
font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: \
normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; \
white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: \
0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; \
-webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; \
">pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / \
平和<br>Kevin R. Bullock</span> </div>

<br></body></html>

_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial

[prev in list] [next in list] [prev in thread] [next in thread] 