[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: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Mon, 5 Oct 2009 18:43:46 +1000

On Mon, Oct 5, 2009 at 5:45 PM, Jan Hendrik <list.jan.hendrik_at_gmail.com>wrote:

> Concerning Re: branch=>merge: additions + modi
> Daniel Becroft wrote on 5 Oct 2009, 9:25, at least in part:
>
> > On Sat, Oct 3, 2009 at 8:28 PM, Jan Hendrik
> > <list.jan.hendrik_at_gmail.com>wrote:
>
> > > Any addition or modification done and committed on a branch is
> > > physically added a second time to the repository once the branch is
> > > merged into trunk and committed, right?
> >
> > I do not believe that this is the case. During the merge, any new
> > files on the branch are basically copies from the branch. They are
> > added (with history), and simply point back to the version added in
> > the branch.
>
> Some years ago I had asked the same question and one of the
> developers confirmed that files added on a branch are added again
> when the branch is merged into trunk and therefore finally exist in
> repository physically twice, not once in the branch and once as a
> mere pointer in trunk.
>

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

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.

<snipped />

Cheers,
Daniel B.

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

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

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