Using Mercurial (hg), is there a way to diff rev 4873 and 4821 but only for my changes?

Question

I want to know what changes I made, without looking at the 30 other files that other team members modified.

So when I hg out, it said the first changeset to push was 4821, so since then I have pulled, merged, and pushed a couple times. Now I want to make sure all the debugging code is removed. Is there a way to diff the current revision (4873) against revision 4821 but only for my changes?

Answer 1

If your changes are in different files than those of your coworkers, which is how it sounds, you can use something like this:

hg diff -r 4821 -r 4863 -I path/to/file1 -I path/to/file2

If they're mixed in the same files as other people's changes then you would have needed to keep your changes in a separate branch (which doesn't require the branch command, anonymous branching is commonly used for this sort of thing).

Answer 2

I don't know if you can upgrade to the recently release Mercurial 1.6 or not, but this functional query language feature they just put in is what you might be looking for.

Answer 3

Try this approach:

1. First clone your local repo to another folder
2. In the new clone, rebase your last changeset so that it immediately follows your the other changeset (this should create a new head from it)
3. Do the diff