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

RE: Branches and tags after trunk move

From: <Chris.Fouts_at_qimonda.com>
Date: 2007-01-10 19:41:16 CET

"You may run into problems....'

So I'll this as a "no" instead. I just rebranched/tagged
off the new trunk location.

>-----Original Message-----
>From: Duncan Murdoch [mailto:murdoch@stats.uwo.ca]
>Sent: Wednesday, January 10, 2007 1:32 PM
>To: Fouts Christopher (QNA RTP PT PREV)
>Cc: users@subversion.tigris.org
>Subject: Re: Branches and tags after trunk move
>
>On 1/10/2007 12:56 PM, Chris.Fouts@qimonda.com wrote:
>> So I can merge from trunk to branch, using the tags I
>created off the
>> orig. //repos/source, for example?
>
>In Subversion, "merge using" means "calculate the diff between
>two things, and apply it to a third thing".
>
>For example, merging revs 1:10 from the trunk into the branch
>means finding the diff between revs 1 and 10 on the trunk, and
>using that diff to patch the branch.
>
>So the answer to your question is yes. You'll just need to be
>careful to choose the right names for the things. You may run
>into problems if your diff crosses the revision that performed
>the renaming, because you'll probably end up renaming your
>branch if you apply that patch.
>
>Duncan Murdoch
>
>>
>>>-----Original Message-----
>>>From: Duncan Murdoch [mailto:murdoch@stats.uwo.ca]
>>>Sent: Wednesday, January 10, 2007 12:49 PM
>>>To: Fouts Christopher (QNA RTP PT PREV)
>>>Cc: users@subversion.tigris.org
>>>Subject: Re: Branches and tags after trunk move
>>>
>>>On 1/10/2007 12:46 PM, Chris.Fouts@qimonda.com wrote:
>>>> Say I branched (and tagged for that matter), from
>//repos/source by
>>>> doing an svn cp.
>>>>
>>>> Now the trunk moved to //repos/trunk/source. What happens to my
>>>> branches and tags that were based off //repos/source?
>>>
>>>Nothing. Think of the repository as just another hierarchical file
>>>system. Before the change, it had several directories
>>>
>>>/source
>>>/branches/branchname
>>>etc.
>>>
>>>and now it has directories
>>>
>>>/trunk/source
>>>/branches/branchname
>>>
>>>The only connection between a file in the branch and one in
>the trunk
>>>is that they may share some of their history.
>>>
>>>Duncan Murdoch
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 10 19:41:38 2007

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