[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 17:22:29 CET

 

> -----Original Message-----
> From: Chris.Fouts@qimonda.com [mailto:Chris.Fouts@qimonda.com]
> Sent: 20 December 2006 16:09
> To: Nelson, Steve (Basingstoke); users@subversion.tigris.org
> Subject: RE: Merging branch into trunk
>
> User2 "needs to" merge trunk to his branch, AFTER User1 merges
> his branch to the trunk - try that!

Like this:

bash-3.1$ cd ../SC1976/
bash-3.1$ svn update
At revision 39.
bash-3.1$ svn merge ../trunk/dxbdpro.p dxbdpro.p
svn: A working copy merge source needs an explicit revision
bash-3.1$ svn merge https://svntest/repos/devrep/dlr/trunk/dxbdpro.p
https://svntest/repos/devrep/dlr/branches/SC1976/dxbdpro.p

This doesn't seem to have done anything.

Is there some difference in direction? You mention merging trunk to
branch rather than branch to trunk.

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 17:45:49 2006

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