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

Re: merge branch vs. commit trunk

From: Jan Hendrik <jan.hendrik_at_bigfoot.com>
Date: 2003-09-24 12:09:43 CEST

Concerning Re: merge branch vs. commit trunk
Ben Collins-Sussman wrote on 23 Sep 2003, 11:03, at least in part:

> Jack Repenning <jrepenning@collab.net> writes:
> > When we say "cheap copy," we mean that the act of making the copy
> > (branch) is cheap. Once it's made, further work on the branch isn't
> > any more or less cheap than working on trunk.
> Correct. If you had made all your changes on the branch,
> progressively, you still would have had to a single 80 meg merge to
> the trunk. And that merge would have been: apply 80 megs of local
> changes to your 'trunk' working copy (by comparing with the branch),
> then commit. The final commit still would have been 80 megs of data.

I see. I had the idea that the merge would happen on the SVN
server, directly from branch to trunk. Anyway, as I see now, even
progressively committed changes on a branch would not have
worked here as everything I did were more or less global changes,
that is affected large numbers of files at once.

> Now, as to why the commit is grinding to a halt... that's a separate
> topic. Come step into our 'performance/scalability' trouble center,
> take a number and a seat. We have our best men working on it. :-)

Well, as the best men are often also those getting nervous when
being looked at them working I'll better take a three hours walk on
the dyke, even if the first autumn rainstorms hunt me ... ;-)

Jan Hendrik

Freedom quote:

     Intellect annuls Fate. So far as a man thinks, he is free ...
     The revelation of Thought takes man out of servitude into freedom.
                 -- Ralph Waldo Emerson, Fate

Mailed with Pegasus Mail 3.12c (32bit).
Never heard of it?
Easy to use, full featured - and freely available.
And *no* automatic virus activation and spreading.
Take a look at http://www.pmail.com
Give it a try - and you'll never miss anything else.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 24 12:06:50 2003

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.