Mercurial: Creating a diff of two commits

Posted by DerKuchen on Stack Overflow See other posts from Stack Overflow or by DerKuchen
Published on 2010-05-03T19:58:09Z Indexed on 2010/05/24 6:21 UTC
Read the original article Hit count: 419

Filed under:

diff

|

hg

Is there a way to get the changes of two commits with mercurial? The second commit is not directly after the first one, there are some other ones between them.

I tried

hg diff [some params] --change xxxxx --change yyyyy > file.patch

but that only includes the last changeset.

If there is no way to achieve this with hg, is there maybe a tool to combine patches?

© Stack Overflow or respective owner

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

Related posts about hg

Creating an SMF service for mercurial web server

as seen on Oracle Blogs - Search for 'Oracle Blogs'
I'm working on a project at the moment, which has a number of contributers. We're managing the project gate (which is stand alone) with mercurial. We want to have an easy way of seeing the changelog, so we can show management what is going on. Luckily mercurial provides a basic web server… >>> More
Mercurial branching a branch doesn't display right in hg serve or hg view

as seen on Stack Overflow - Search for 'Stack Overflow'
I've been doing some development on a branch and realized that before it could be complete something else need to be done first. I decided that I would branch my current branch and do the requiste changes in that branch then merge them back together and then merge my working branch into default. Basically… >>> More
hg command to see the changeset prior to an hg fetch

as seen on Stack Overflow - Search for 'Stack Overflow'
What mercurial command can you use to see the changeset prior to changeset xyz? If you do hg log -r :xyz you see all the changesets prior to (and including) xyz - listed in ascending order. But I'd like to easily see just the prior changeset. Update: Really what I'm after is: If I do an hg fetch… >>> More
In Mercurial, what is the exact step that Peter or me has to do so that he gets back the rolled back

as seen on Stack Overflow - Search for 'Stack Overflow'
The short question is: if I hg rollback, how does Peter get my rolled back version if he cloned from me? What are the exact steps he or me has to do or type? This is related to http://stackoverflow.com/questions/3034793/in-mercurial-when-peter-hg-clone-me-and-i-commit-and-he-pull-and-update-he-g The… >>> More
Mercurial hg Subrepository Problem - "abort: unknown revision'

as seen on Stack Overflow - Search for 'Stack Overflow'
Note: I asked this yesterday over at kiln.stackexchange.com, but haven't gotten an answer, and it's holding up my work. So I figured I'd give it a shot here. My main mercurial repository has a bunch of subrepositories in it. During initial setup, I made a mistake in my .hgsub. Namely, I pointed two… >>> More