Mercurial: Diff current source vs source at point in time

Posted by Marcus on Stack Overflow See other posts from Stack Overflow or by Marcus
Published on 2010-04-06T17:50:19Z Indexed on 2010/04/06 17:53 UTC
Read the original article Hit count: 241

Filed under:

mercurial

|

diff

|

examdiff

I know how to view all changes in a changeset..

But let's say you update your source, you do a pull and you get 3 new changesets. How can you compare the current state of the remote repository (with the 3 changesets checked in) vs. the current source (on your local machine)?

I'd like to do this using the visual diff tool which I currently have configured (Examdiff or Kdiff3).

© Stack Overflow or respective owner

Related posts about mercurial

Mercurial fails while commiting/updating/etc. using Mercuriual+TrueCrypt+MAC

as seen on Stack Overflow - Search for 'Stack Overflow'
While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows: ** unknown exception encountered, details follow ** report bug details to http://mercurial.selenic.com/bts/ ** or [email protected] ** Mercurial Distributed SCM (version 1.5.2+20100502) **… >>> More
OS X, Mercurial and MediaTemple problem

as seen on Stack Overflow - Search for 'Stack Overflow'
I've installed Mercurial per MT's knowledge base file here. Working with it server side using ssh from my Mac works fine. I can initialize repositories and the like, but pulling from the server or pushing from my Mac produces an error I don't understand. Here's what I get when call hg push from… >>> More
Mercurial to Mercurial to Subversion Workflow Problem

as seen on Stack Overflow - Search for 'Stack Overflow'
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate… >>> More
How do I configure Mercurial to use environment variables in mercurial.ini

as seen on Stack Overflow - Search for 'Stack Overflow'
How can I modify the mercurial.ini file to include an environment variable such as %userprofile%. Specific situation: I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include: ignore = c:\users\user\.hgignore Where user is my username literal… >>> More
Mercurial: Problem converting Windows cvs repository to mercurial

as seen on Stack Overflow - Search for 'Stack Overflow'
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error: C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter assuming destination shelter-hg initializing destination shelter-hg repository connecting to :local:c:\cvs abort:… >>> More

Related posts about diff

newline-ignoring diff / diff across multiple lines / reflow-ignoring diff

as seen on Stack Overflow - Search for 'Stack Overflow'
Does anybody know of a diff-like tool that can show me the changes between two text files, but ignore changes in whitespace including newlines? Here's an example: the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the… >>> More
Unix diff to only print relevant diff

as seen on Stack Overflow - Search for 'Stack Overflow'
I have these two files File:11 11 12345 File:22 123 456 Output of diff 11 22 2c2 < 456123 --- > 789 Output to be < 456123 > 789 I want it to not print 2c2 and "--" line. I looked at the man page but could not locate any help. Any ideas? The file has more than 1K lines >>> More
How to make meld prefer an SVN diff over a CVS diff

as seen on Stack Overflow - Search for 'Stack Overflow'
We have some directories that are tracked in both CVS and SVN (loooong story). When I change a file in one of these and run meld it diffs it against the SVN version. However for some of the other developers it diffs against CVS. Is there a way to specify which one gets priority? Everyone is using… >>> More
Is there a JS diff library against htmlstring just like google-diff-match-patch on plain text?

as seen on Stack Overflow - Search for 'Stack Overflow'
Currently I am using google-diff-match-patch to implement a real-time editing tool, which can synchronize texts between multiple users. Everything works great when operations are only plain texts, each user's operation(add/delete texts) could be diff-ed out by comparing to old text snapshot with the… >>> More
Paragraph-based diff program?

as seen on Stack Overflow - Search for 'Stack Overflow'
Does anyone know of a diff viewer or comparison program that can do paragraph-based differentials? My repos has a large number of LaTeX files that are formatted into 80-character wide paragraphs (for easy editing with vim). It's currently very difficult to interpret the diffs between various versions… >>> More