"Ray Johnson" <Rayj@ingenio.com> wrote on 09/23/2004 02:14:23 PM:
> I often need to compare branches to determine what files have changed.
The
> "svn diff" command basically does this. However, it is somewhat
difficult to
> use that to construct a list of the files that have be modified, added
or deleted.
>
> It would be really nice if there was a "svn diff -q" or "svn diff
--brief"
> command akin to the same option in gnu diff. This just reports the
files that
> have changed. So you would get something like:
>
> svn diff -q http://svn/MyCode/branch/branch23 http://svn/MyCode/trunk
>
> that would return something like:
> M src/www/index.html
> M src/www/index.html
> A src/www/newproduct.html
> D src/www/help.html
Let's assume that the branch URL is currently checked out to your WC. This
command gives you something like that:
svn merge -r @COPYREV:HEAD http://svn/MyCode/trunk --dry-run
Where @COPYREV is the revision that the branch was created, or last
merged. Of course, if you do not have a WC, you can just add the second
URL to the same command.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 23 21:17:42 2004