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

Re: branch=>merge: additions + modifications twice in repository?

From: Jan Hendrik <list.jan.hendrik_at_gmail.com>
Date: Mon, 5 Oct 2009 12:15:11 +0200

Concerning Re: branch=>merge: additions + modi
Daniel Becroft wrote on 5 Oct 2009, 18:43, at least in part:

> Hmm, I just ran a quick test with svn v1.4.8 - the add of the file
> from the branch is an add (with history).
>
> After the merge (before the commit):
>
> C:\Temp\svn_sandpit>svn status .\wc1\trunk
> M wc1\trunk
> A + wc1\trunk\binary_file.jar
>
> Also, I had a look at the individual revisions file created in the
> repository. The original binary_file.jar is approx 11MB in size.
>
> r3 (add in branch) : 10,312KB
> r4 (merge into trunk) : 2KB

One advantage of FSSF I suppose. ;) I stick with BDB.

> I get the same results under 1.5.x and 1.6.x versions as well. I don't
> know if this has changed from a version prior to 1.4.x.

Thanks, Daniel, for taking the time. So SVN was smarter in this
than assumed for a long time. I did a quick search in my local
archive of SVN list mail, but could not find my posting from back
then. Maybe it's buried somewhere in the archive of old versions,
scripts and tutorials. Wouldn't be much surprised if it was pre-1.4
though.

JH
---------------------------------------
Freedom quote:

     The shepherd drives the wolf from the sheep's throat,
     for which the sheep thanks the shepherd as his liberator,
     while the wolf denounces him for the same act as the destroyer of liberty.
               -- Abraham Lincoln

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403507

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-05 12:16:06 CEST

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