[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 18:04:17 CET


> -----Original Message-----
> From: Méresse Christophe [mailto:christophe.meresse@nagra.com]
> Could you provide us the part of your dxbdpro.p file where
> there is a conflict (the part with the <<< and >>>) ?

bash-3.1$ tail dxbdpro.p
   input stream temp_load close.

   return "".
<<<<<<< .working
 /* Comment by nelson for SC1975 */
/* Darryl's comment for sc1976 */
/* Comment by nelson for SC1975 */
>>>>>>> .merge-right.r39

Incidentally, I also tried merging using Christophe's method, with the same result:

bash-3.1$ svn merge -r 34:HEAD https://svntest/repos/devrep/dlr/trunk/dxbdpro.p ./dxbdpro.p
C dxbdpro.p

However, when I specified 38, I got a different result:

bash-3.1$ svn merge -r 38:HEAD https://svntest/repos/devrep/dlr/trunk/dxbdpro.p ./dxbdpro.p
G dxbdpro.p


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 18:05:23 2006

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.