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

RE: Merging branch into trunk

From: <Steve.Nelson_at_uk.delarue.com>
Date: 2006-12-20 15:51:37 CET

> -----Original Message-----
> From: Chris.Fouts@qimonda.com [mailto:Chris.Fouts@qimonda.com]

> To answer your last question, in Subversion, yes a "tag" is
> essentially a copy of what you are tagging. So tagging the
> trunk "copies" the trunk. What this enables you to do is
> merge trunk deltas to a branch
> > cd to /branch_workspace
> > svn merge //repos/project/tags/trunk-branchname
> //repos/project/trunk

Yes, I can see this now. We do a diff between the snapshot of the
trunk, the development branch, and apply the results in the working copy
of the trunk.
 
> To answer your questions merging onto trunk, yes you would
> have to check out the "whole" trunk, since in Subversion, you just can
NOT check out
> a file (one of its weaknesses IMHO). The good thing is you only have
to
> do this once (per user).

Bother!

That's a real pain. So, in practice, developers will be changing no
more than half a dozen files per ticket, but need to have a local copy
of the whole trunk (several thousand files) just to merge their changes?
I can *really* see the benefit of the trunk being divided up.

I wonder if they could use a central location where a copy of the trunk
is held, just for commits? That is beginning to sound non-trivial, and
developers won't want to use the system if it isn't simple to use.

S.

**********************************************************************
This e-mail and any files attached are strictly confidential, may be legally privileged
and are intended solely for the addressee. If you are not the intended recipient, note
that any disclosure, copying, distribution, or use of the contents of this message and
attachments is strictly prohibited. Please notify the sender immediately by return email,
phone or fax and then delete the e-mail and any attachments immediately. The views
and or opinions expressed in this e-mail are not necessarily the views of De La Rue plc
or any of its subsidiaries and the De La Rue Group of companies, their directors,
officers and employees make no representation about and accept no liability for its
accuracy or completeness. Please ensure you have adequate virus protection before
you open any attachment as the De La Rue Group of companies do not accept liability
 for any viruses.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 20 15:52:45 2006

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