[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:44:07 CET

 

> -----Original Message-----
> From: Steve.Nelson@uk.delarue.com
> > From: Chris.Fouts@qimonda.com [mailto:Chris.Fouts@qimonda.com]
> > Ah, you must NOT have created tags when you branched.
>
> Ah, no, I've not done anything with tags - will go and study this.
>
> > If done correctly, you should've
> >
> > - Created a tag on the branch to signify when you branched
> > > svn cp //repos/project/branches/SC999
> > //repos/project/tags/SC999-trunk
>
> Ok, so I've not done any tagging.

Ok, so a tag is a snapshot of the trunk to which no commits are made,
rather than the branch, which is developed. I suppose a tag isn't
really necessary as long as I recall the revision number at the time at
which the branch was created.

> Aha... so here, do I need to have checked out the trunk as
> well as just the branch I am working on? As per previous thread, my
trunk is very
> large, so I'm not keen on requiring users to check out the trunk to
make
> merges. Is this unavoidable?
 
> > > svn merge //repos/project/tags/SC999-trunk
> > //repos/project/branches/SC999
>
> Again... reference to tags. Will read about this.

Ok - I see the use of tags now. Question: do tags take up any more
space, or do they function like hard links?

Now, I managed to do some merges, but they didn't behave as I expected:

$ svn co https://svntest/repos/devrep/dlr/trunk
$ cd trunk
$ svn merge https://svntest/repos/devrep/dlr/trunk/dxzz00em0001.p
https://svntest/repos/devrep/dlr/branches/SC999/dxzz00em0001.p
$ svn commit -m "merge done?"

I checked, and indeed the changes in SC999 were merged into the trunk.

I then did:

$ svn merge https://svntest/repos/devrep/dlr/trunk/dxzz00em0001.p
https://svntest/repos/devrep/dlr/branches/SC1230/dxzz00em0001.p
$ svn commit -m "merge done with sc1230?"

Upon checking, the changes in sc1230 were there, but the changes from
sc999 were over-written, and there was no conflict message. The change
was just a comment at the top of the program.

What have I done wrong?

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:45:22 2006

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