Yes, they are actually a trunk and branch in the same repository.
I am trying to merge code from trunk A into the working directory of
branch B.
Does the svn merge example you provided still apply ?
Rather, does '42' need to be the revision in A at which I did the last
merge, or can it remain constant (i.e. the revision in A at which branch
B was created) ?
Thanks,
Michael
-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2006q2@ryandesign.com]
Sent: 23 May 2006 15:50
To: Michael Pickard
Cc: users@subversion.tigris.org
Subject: Re: Merging and Additions
[snip]
You probably want
svn merge -r42:HEAD http://repository/abc/trunk/repa
where 42 is either the revision at which branchb was created from
repa, or the last revision at which you performed the above merging
procedure.
It looks to me like these are a trunk and a branch in the same
repository. If they're actually different repositories, as you said
above, then 42 is the revision in repa at which you did the last merge.
>
Michael Pickard
Software Engineer
Visit London
6th Floor,
2 More London Riverside, London, SE1 2RR
Tel: +44 (0)20 7234 5857
Fax: +44 (0)20 7234 5751
www.visitlondon.com
Visit London is the official visitor organisation for London. Visit London is partly funded by Partnership, the Mayor's London Development Agency and the Association of London Government.
The information contained in this e-mail is confidential and intended for the named recipient(s) only. If you have received it in error, please notify the sender immediately and then delete the message. If you are not the intended recipient, you must not use, disclose, copy or distribute this email. The views expressed in this e-mail are those of the individual and not of Visit London. We reserve the right to read and monitor any email or attachment entering or leaving our systems without prior notice.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 24 10:47:48 2006