[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 09:45:44 +0200

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.

While generally shy of branching and thus by no means expert my
understanding of merge is - contrary to the process of branch
creation - not like copying, rather like repeating all the
modifications, additions and deletes done in any number of steps
on the branch in one single step on trunk. However, the history of
those many steps remains with the branch exclusively; basically it
will depend on the commit message if this history can be traced
from trunk back to its evolution on the branch.

Now the feature new in 1.6 Stefan pointed me at seems to answer
the question. As far as I understand it SVN keeps a checksum of
all files physically present in the repository and before adding a
files checks if an identical one is already present (and does
something similar when the same modification is done on several
files in the same commit).

Please correct me if my understandings of these things are wrong,
not least for the record and later readers coming across this thread.


Freedom quote:

     Do what you feel in your heart to be right -
     for you'll be criticized anyway.
     You'll be damned if you do, and damned if you don't.
               -- Eleanor Roosevelt


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

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