[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: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-05-24 12:34:00 CEST

On May 24, 2006, at 10:49, Michael Pickard wrote:

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

Yes, what I wrote still applies. You must remember the revision at
which you did the last merge. This is because Subversion does not yet
have "merge tracking." I think most people record this revision
number in their commit message, so that they can later look at the
log to see what it was. Another alternative, I believe, is the
svnmerge script, which tries to track this for you? I'm not sure of
the specifics; I haven't looked at it yet.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 24 12:35:25 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.