How do I diff a modified working copy of a branch against a specific
version of the mainline?
This operation is essential when sanity-checking merges from mainline to
a branch of files that
have changed more in mainline than in the branch.
With cvs, that was as easy as saying:
bash-2.05b$ cvs diff -r sh-elf-4_1-merge-20050913 Makefile.in
With svn, specifying a revision alone won't help, since that will diff
against the version of the
file in the branch in the specified revision of the whole tree.
I tried:
bash-2.05b$ svn diff Makefile.in
svn+ssh://[EMAIL PROTECTED]/svn/gcc/trunk/gcc/[EMAIL PROTECTED]
But that gives me an error message:
svn: Target lists to diff may not contain both working copy paths and URLs
