[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
John Peacock wrote on 23 Sep 2003, 11:56, at least in part:

> Jan Hendrik wrote:
> > Having to do several global changes on our production website I was
> > not yet bold enough to do them on a branch. So I did them in one of
> > the working copies.
> You _always_ make changes in the working copy. The only changes you
> can make server side are moves/renames.

Right. I should have said "in the regular working copy, without
switching to a branch or checking out a branch".

> > However, committing about 4500 pages (80 MB in total) brought
> > my machine to its knees (Win2K, P200, 144 MB, CPU usage 4-
> > 10%, RAM usage c. 90MB).
> That is really a way underpowered machine, IMNSHO. 1.2GHz machines
> are really cheap (and the 2GHz are not bad), plus RAM is still
> reasonable. You also didn't say how much you changed in the files
> themselves, since the diff is done on the local machine.

So it looked indeed as the local HDD was quite busy, but no
activity on the network (the SVN server runs on another machine,
access via Apache).

But the machine is not so bad. End of 2001 I had a P4 1.6 GHz
machine here, but passed it on after a month: cannot get used to a
mouse lying somewhere on the table, a mile off. I am a keyboard
man, used to the touchpad right under the thumbs. And notebooks
are not so cheap ... Generally I found the P4 was only recognizably
faster in disk access like reading folder contents, else compared to
the P200 the gains were insignificant here. Compiling or diff
calculation may be ifferent.

However, I had thought to copy my working copy to the P4 server
box and do the commit from there. I may do it the next time,
another global change is around the corner: no, I don't like these
global changes, especially not for the upload to the web server, but
since the socialists and greens took over power in Germany in
1998 the speed new laws come out has accelerated. And most
new laws get changed thrice and even more within 12 months.
Someone has calculated that the socialists have created/changed
more acts in the last 4 or 5 years than in the last 20 or 30 years

In terms of diff the changes may well have been significant though
they just affected the link column at the start of the pages and the
address block at the end.

Jan Hendrik

Freedom quote:

     Public servants say, always with the best of intentions,
     'What greater service we could render
     if only we had a little more money and a little more power.'
     But the truth is that outside of its legitimate function,
     government does nothing as well or as economically as the private sector.
                -- Ronald Reagan, October 27, 1964

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:07:49 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.