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

RE: Merging and Additions

From: Quentin Arce <qarce_at_yahoo.com>
Date: 2006-06-05 16:50:35 CEST

--- Michael Pickard <mpickard@visitlondon.com> wrote:

> 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) ?

I think you must have your answer by now... but, just
in case.

If you have every used patch and diff in Unix. Think
of a merge as a intelegent diff/patch operation.

svn merge -r42:HEAD

This is to say. Create a diff of the changes made
from version 42 to HEAD version from the trunk
location and apply the resulting diff as a patch to my
current directory location. In other words If you
had checked out your branch to the current directory
then you would be applying the changes from trunk to
the current location. Remember ... 42 is the state
from... so if you need a change from the checkin that
pushed the repository to rev 42... then you want
version 41... to get the changes that happened to
create version 42 from 41.

Please Eveyone correct me if I'm wrong.



> 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

Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 5 16:52:16 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.