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

Re: Odd "diff" behavior

From: Karl Heinz Marbaise <khmarbaise_at_gmx.de>
Date: Mon, 24 Mar 2008 00:08:42 +0100


> $ svn merge -r29788:29789 http://svn.collab.net/repos/svn/trunk
> --- Merging r29789 into '.':
> A notes/wc-2.0-design
> $ svn st [03/23/08 4:47PM]
> M .
> A + notes/wc-2.0-design
> $ svn diff
> Property changes on: .
> ___________________________________________________________________
> Modified: svn:mergeinfo
> Merged /trunk:r29789

> If I did a normal add of the file,
This is exactly what you didn't have done.
The file has been added on the branch (or in this case on the trunk).
This is indicated by the "+" sign after "A" and merged it into the
working copy.

> it would show up in the diff.
I would say no, cause the file in this particular case has an ancestry
(comming from the trunk; merged or in other words copied) in this
particular case.

You will get the same result if you only copy a file in the WC (svn cp
file3.txt fileC.txt; Diff will print out nothing,
but svn status will print out:
A + fileC.txt

So this means there is no difference between the copied file and the
original. And a merged file is (not really) more than a copied file.

> Is my expectation of seeing the added file in the
> diff wrong?
My first thought was i expected it too...but i tested it with SVN 1.4.2
and get exactly the same result....and then i thought a little bit about
and came to the result i would say yes you are wrong...

Kind regards
Karl Heinz Marbaise

SoftwareEntwicklung Beratung Schulung    Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl Heinz Marbaise        ICQ#: 135949029
Hauptstrasse 177                         USt.IdNr: DE191347579
52146 Würselen                           http://www.soebes.de
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-24 00:57:28 CET

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