What to do befor "hg update"

Robert Bauck Hamar r.b.hamar at usit.uio.no
Wed Jul 8 12:58:14 CDT 2009


*Matt Mackall:
>On Wed, 2009-07-08 at 19:06 +0200, Robert Bauck Hamar wrote:
>> *Roland Schmitz:
>> >Hello everyone,
>> >
>> >i'm new to mercurial, but i think, this could be my tool for version 
>> >management ;-}
>> >As far as i'm today, i found that i can ask mercurial what it will do. Before 
>> >doing a hg pull i'll run hg incomming, ...
>> >hg push/hg outgoing
>> >hg commit/hg status
>> >But i havent found which command will tell me what hg update will do.
>> 
>> $ hg parents
>> ... get revision id, say 42
>> $ hg diff -r 42 -r tip
>> ... patch hg update would apply.
>
>..which is the same as:
>
>hg diff -r . -r tip
>hg diff -r .:tip

Of course. This is me being stupid. Thanks!

>> Note, that if you have uncommited changes in your working directory, the 
>> diff won't show them.
>
>hg diff -r tip
>
>Replace 'tip' with your branch name if you're using named branches.

I was rather thinking of the combined result of 

hg diff
and
hg diff -r .:tip

Would that be possible?

-- 
Robert Bauck Hamar
USIT/SAPP/GT - Cerebrum
http://www.uio.no/sok?person=hamar
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20090708/8870a870/attachment.pgp 


More information about the Mercurial mailing list