[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: how to find what would be updated: status --show-updates not enough

From: Travis <svn_at_castle.fastmail.fm>
Date: 2006-11-01 05:39:30 CET

On Oct 13, 2006, at 3:19 AM, Rob Hubbard wrote:
> Hello Joe,
> That relates to my posting:
> "Feature suggestion: --dry-run on update"
> <http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=56199>
> (I was interested in detecting conflicts in particular.)
> I hope the SVN developers do implement "--dry-run" for "svn update".
> Rob.

Some instructions that I wrote for some of my users seem relevant here:

1) How to predict what will happen when you run "svn update"

Run the merge command like this (recursive by default) to see what
files would get modified and how, including which would have conflicts:

    svn merge -r BASE:HEAD --dry-run .

To see the changes that update would try to merge, run this command:

    svn diff -r BASE:HEAD [list of files and directories]

2) How to diff your local modifications against the latest version in
the repository

Without any arguments, "svn diff" is equivalent to "svn diff -r
BASE". This command tells you what you have changed files based on
what repository copy of the files you started with (the baseline).

To see how your changes relate to the latest in the repository, run
the diff command like this (recursive by default):

    svn diff -r HEAD [list of files and directories]

And to see the differences between your baseline and the latest in
the repository (which an update will try to merge with your changes
to create a new baseline), run

    svn diff -r BASE:HEAD [list of files and directories]

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 1 05:40:16 2006

This is an archived mail posted to the Subversion Users mailing list.