Joern RENNECKE - svn diff branch woprking copy against mainline? (original) (raw)

This is the mail archive of the gcc@gcc.gnu.orgmailing list for the GCC project.

• From: Joern RENNECKE
• To: gcc at gcc dot gnu dot org
• Date: Wed, 02 Nov 2005 22🔞50 +0000
• Subject: svn diff branch woprking copy against mainline?

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.inWith 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://amylaar@gcc.gnu.org/svn/gcc/trunk/gcc/Makefile.in@106390But that gives me an error message:svn: Target lists to diff may not contain both working copy paths and URLs

• Follow-Ups:
  • Re: svn diff branch woprking copy against mainline?
    * From: Mike Stump