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

Re: Make svn diff produce output for new files added on another branch

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 20 Nov 2010 23:45:02 +0100

On Sat, Nov 20, 2010 at 11:55:51PM +0200, Stanimir Stamenkov wrote:
> After merging changes from a branch different from the working one
> I could get files added on that other branch, and the svn stat
> would look like:
> M .
> A + a_new_file
> Issuing svn diff at this point doesn't include the "a_new_file"
> content in the output. Could svn diff be instructed to include the
> "a_new_file" content in the output?

Not with Subversion 1.6 because it always diffs copies against their source.
So you can see modifications you've made after copying, but you cannot
make the copied file appear like an added file in the diff.

In 1.7 there will be a new option which instructs svn diff to show a copy
just like it would show an added file. This option is currently called
--show-copies-as-adds but this name might change before release if we
can come up with a better name. There is a short name for the option
as well, currently --sca.

Received on 2010-11-20 23:45:49 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.