Easy way to compare branches
hg at 101tec.com
Mon Mar 31 11:47:51 CDT 2008
On Mar 29, 2008, at 4:50 PM, Giorgos Keramidas wrote:
> On Fri, 28 Mar 2008 14:26:11 -0700, Hans-Henning Gabriel <hg at 101tec.com
> > wrote:
>> This is my situation:
>> I have two named branches: '1.0.0' and 'default'.
>> I work on '1.0.0', do several commits and pushes. At the same time
>> somebody else works on 'default', does some commits and pushes.
>> Also possibly somebody does transplant the '1.0.0' branch changes
>> the 'default' branch, using the transplant extension.
>> Now is there an easy way for me to see the differences between my
>> local '1.0.0' working directory branch and the remote 'default'
>> branch? Some hg commands? At the end, I would like to see kind of
>> that displays all differences between the two branches.
> How about a patch?
> You can clone the local `1.0.0' and pull `default' into the clone:
> hg clone 1.0.0 demo
> cd demo
> hg pull default
> Then it should be possible to run "hg diff" on the heads you are
> interested to look at:
> hg diff --git -r localhead -r remotehead | less
Actually it would be good to just identify a list of changesets that
has not yet been transplanted from one branch to another.
More information about the Mercurial