Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
hg diff and moves
There are currently too many topics in this group that display first. To make this topic appear first, remove this option from another topic.
There was an error processing your request. Please try again.
flag
  3 messages - Collapse all  -  Translate all to Translated (View all originals)
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post was successful
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
Dave S  
View profile  
 More options Sep 8 2012, 5:29 pm
From: Dave S <snidely....@gmail.com>
Date: Sat, 8 Sep 2012 14:29:47 -0700
Local: Sat, Sep 8 2012 5:29 pm
Subject: hg diff and moves
I was using hg 1.9-something (what Fedora is still pointing at, it
seems) and found myself diffing file X/Y/Z/foo.c with /dev/null
because I had done

hg move W/foo.c X/Y/Z

and hg diff  -r new -r old wasn't following, and the command doesn't
seem to have a follow option.    Am I missing understanding how to do
the the diff, or did perhaps following get added to the more recent
releases?

/dps

--
test signature -- please apply at front gate on Tuesdays only.
_______________________________________________
Mercurial mailing list
Mercur...@selenic.com
http://selenic.com/mailman/listinfo/mercurial


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Mads Kiilerich  
View profile  
 More options Sep 8 2012, 7:15 pm
From: Mads Kiilerich <m...@kiilerich.com>
Date: Sun, 09 Sep 2012 01:15:08 +0200
Local: Sat, Sep 8 2012 7:15 pm
Subject: Re: hg diff and moves
Dave S wrote, On 09/08/2012 11:29 PM:

> I was using hg 1.9-something (what Fedora is still pointing at, it
> seems)

Only if you are using the old Fedora 16. Fedora 17 has 2.2.3. The
internal Mercurial API used by extensions and tortoisehg is not stable,
and it is thus not appropriate to update Mercurial as updates in stable
releases.

> and found myself diffing file X/Y/Z/foo.c with /dev/null
> because I had done

> hg move W/foo.c X/Y/Z

> and hg diff  -r new -r old wasn't following, and the command doesn't
> seem to have a follow option.    Am I missing understanding how to do
> the the diff, or did perhaps following get added to the more recent
> releases?

Diff will by default use the diff format and it doesn't have a way to
show renames. Use --git or set [diff] git = True to use the format
introduced by git that is capable of showing renames.

See also http://mercurial.selenic.com/wiki/GitExtendedDiffFormat .

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


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Dave S  
View profile  
 More options Sep 9 2012, 2:40 am
From: Dave S <snidely....@gmail.com>
Date: Sat, 8 Sep 2012 23:40:32 -0700
Local: Sun, Sep 9 2012 2:40 am
Subject: Re: hg diff and moves

On Sat, Sep 8, 2012 at 4:15 PM, Mads Kiilerich <m...@kiilerich.com> wrote:

[...]

> Diff will by default use the diff format and it doesn't have a way to show
> renames. Use --git or set [diff] git = True to use the format introduced by
> git that is capable of showing renames.

> See also http://mercurial.selenic.com/wiki/GitExtendedDiffFormat .

Thanks!

/dps

--
test signature -- please apply at front gate on Tuesdays only.
_______________________________________________
Mercurial mailing list
Mercur...@selenic.com
http://selenic.com/mailman/listinfo/mercurial


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
End of messages
« Back to Discussions « Newer topic     Older topic »