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

RE: Re: Help w/Merging/Tagging

From: <Chris.Fouts_at_qimonda.com>
Date: 2006-08-18 16:07:13 CEST

Here's a good example...


>-----Original Message-----
>From: Ryan Schmidt [mailto:subversion-2006c@ryandesign.com]
>Sent: Thursday, August 17, 2006 7:55 PM
>To: Aaron Davies
>Cc: users@subversion.tigris.org
>Subject: Re: Help w/Merging/Tagging
>On Aug 17, 2006, at 23:51, Aaron Davies wrote:
>> Hi, I have a question about how to properly do merging/tagging. The
>> situation is this: we have a main branch, named for the part of the
>> year, Q2. We have a tag for a specific configuration of that branch,
>> UAT2. That tag was cut too early, and now many changes need to be
>> merged into it. Since these are not things that should be present in
>> HEAD of Q2, I currently have them in a local source tree, which is
>> composed mostly of explicit checkouts of earlier revisions, but
>> partially of directories switched to HEAD, plus the occasional local
>> edit.
>> I would now like to check this entire tree back into the
>UAT2 tag, but
>> I can't figure out how. I get the impression it would
>something along
>> the lines of "svn merge ./UAT2 ./Q2-custom ./UAT2", but that gives a
>> message about needing revision numbers specfied, and I don't
>know what
>> revisions to use. Is this the right approach, and if so, how exactly
>> do I do it? Any help would be much appreciated!
>Assuming there were no other modifications done in the UAT2
>tag -- that is, considering that your current mixed working
>copy completely represents how you want the UAT2 tag to look
>-- consider just "svn rm"ing the UAT2 tag and recreating it by
>copying your working copy there. I think that will be easier
>than trying to merge it. I'm not even sure if you could merge
>it, since merging is something you do from things that have
>already been committed, and your changes haven't been
>committed anywhere yet if I understand you correctly.
>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 Fri Aug 18 16:09:52 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.