Change your config spec to this for the purpose of the merge (keeping the
branch point the same), and merge from the latest on service_pack branck to
your view:
element * CHECKEDOUT
element * ../mybranch/LATEST
element * ../service_pack/LATEST -mkbranch mybranch
element * .../v1.1/LATEST
element * MY_LABEL -mkbranch v1.1
#element * MY_LABEL -mkbranch service_pack
Mark
--- Stefan Mayer <qedstm@eed.ericsson.se> wrote:
>
> Hi Wayne,
>
> Wayne Bridgman wrote:
> >
> > I currently have a config spec as follows:
> >
> > element * CHECKEDOUT
> > element * ../mybranch/LATEST
> > element * ../service_pack/LATEST -mkbranch mybranch
> > element * MY_LABEL -mkbranch service_pack
> >
> > Does anyone know if it is possible to merge the service_pack branch back to
> > main, resulting in the creation of a new branch off main, and the
> > redirection of the merge to this new branch? ie merging the service_pack
> > branch to main automatically creates a v1.1 branch off main, checking it
> out
> > and merging service_pack to v1.1.
> > Please don't ask why - its a long and boring story.
>
> Do you want to the changes also on the main-branch? Or only on the new
> v1.1 branch?
>
> In the first case (also on /main/LATEST), just merge to main and branch
> off.
>
> In the second case:
>
> add to your configspec:
>
> element * .../v1.1/LATEST
> element * /main/LATEST -mkbranch v1.1
>
> Then you can simply do a
>
> ct findmerge . -fver .../service_pack/LATEST -merge
>
> (or -print first, if you want to validate, that everything is done
> right)
>
> What will happen (just tested here): When the file is checkedout during
> the merge, the branch is automatically created and the file is merged to
> the version on the new branch. As a result, you will get a new version
> (after checkin of course ;o)) on the v1.1 branch, attached to it is a
> merge arrow from service_pack/LATEST.
>
> BR
>
> Stefan Mayer
>
> --
> Senior Consultant for Software Configuration Management
> QIS Systemhaus, Aachen
> http://www.qis-systemhaus.de
> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
>
__________________________________________________
Do You Yahoo!?
Get personalized email addresses from Yahoo! Mail
http://personal.mail.yahoo.com/
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Tue Jul 31 2001 - 22:03:53 EDT