Search code examples
mercurial

Diff a single file between branches in mercurial

I'm working on a website using two branches: develop (for actively working on code) and default (where I merge features when they're ready to go live). I've just merged changes and I'm getting this message when switching between the two branches:

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

I've run hg status --rev default:develop to figure out which file it's referring to, but I haven't been able to figure out what is different.

Here's what I've tried so far:

hg diff --rev default:develop
hg diff --rev default:develop file.php

Could someone point me in the right direction?

Solution

    1. Diff between two branches:

      hg diff -r BRANCH1:BRANCH2

    2. Diff a single file between two branches:

      hg diff -r BRANCH1:BRANCH2 the_sinlge_file_to_diff

    Reference