You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Ch...@qimonda.com on 2007/01/10 17:46:55 UTC
Branches and tags after trunk move
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?
--------------------------------------
Chris T Fouts
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Branches and tags after trunk move
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jan 10, 2007, at 11:46, Chris Fouts 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?
I would expect them to continue to work properly?
--
To reply to the mailing list, please use your mailer's Reply To All
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: RE: Branches and tags after trunk move
Posted by Rob van Oostrum <ro...@blastradius.com>.
You'll may have to refer to one URL or the other depending on what
revision point you're trying to refer to (and whether that point is
before or after the rename you did), but yes.
> -----Original Message-----
> From: Chris.Fouts@qimonda.com [mailto:Chris.Fouts@qimonda.com]
> Sent: Wednesday, January 10, 2007 12:57 PM
> To: users@subversion.tigris.org
> Subject: RE: Branches and tags after trunk move
>
> So I can merge from trunk to branch, using the
> tags I created off the orig. //repos/source, for
> example?
>
> >-----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
RE: Branches and tags after trunk move
Posted by Ch...@qimonda.com.
"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
Re: Branches and tags after trunk move
Posted by Duncan Murdoch <mu...@stats.uwo.ca>.
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
RE: Branches and tags after trunk move
Posted by Ch...@qimonda.com.
So I can merge from trunk to branch, using the
tags I created off the orig. //repos/source, for
example?
>-----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
Re: Branches and tags after trunk move
Posted by Duncan Murdoch <mu...@stats.uwo.ca>.
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