On Fri, Aug 15, 2008 at 11:15:25AM +1000, Gavin Maltby wrote:
> Gavin Maltby wrote:
> > Hi,
> >
> > When I land up with two heads after a pull is there
> > a simple way to:
> >
> > a) list all files changed on each branch
>
> I should say I know I can achieve this through discovering
> the range of changesets unique to each branch and
> doing an hg log -v -r specifying that range of changesets,
> grep for ^files: etc etc etc. I want all that in one
> hg command :-)
Dunno 'bout one, but you might take a look at
http://www.selenic.com/mercurial/wiki/index.cgi/FindCommonAncestorOfRevisions
which tells you how to get the common ancestor in one command:
hg debugancestor rev1 rev2
the output of which you can then use as a base in an hg status command:
hg heads --template "{node} " | read head1 head2
hg debugancestor $head1 $head2 | IFS=: read junk ancestor
hg status --rev $ancestor:$head1
hg status --rev $ancestor:$head2
That's the best I think that can be done short of writing an extension, but
at least the scripting is very simple.
Danek
