[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Checkout's over checkouts.
From: |
Russ Sherk |
Subject: |
Re: Checkout's over checkouts. |
Date: |
Tue, 29 Mar 2005 13:26:35 -0500 |
On Tue, 29 Mar 2005 18:08:15 +0100, Euan Guttridge
<address@hidden> wrote:
>
>
> -----Original Message-----
> From: address@hidden
> [mailto:address@hidden Behalf Of
> Jim.Hyslop
> Sent: 29 March 2005 17:59
> To: address@hidden
> Subject: RE: Checkout's over checkouts.
>
> Euan Guttridge wrote:
> > Thanks for the input Jim and Rick, to clarify
> >
> > Objective:
> > - check out a branch to workspace
> > - *overwrite* a number of those files in workspace from
> > various tags (not
> > update so there is no possibility of merge conflicts)
> > - tag the consolidated workspace
> >
> > Caveats:
> > - I can't specify tagged files by name (too many)
> > - I will use two or more tag sets (of potentially 20 + files each)
>
> Thanks for the clarification.
>
> If you are starting with a fresh checkout, then you do not need to worry
> about any kind of merge conflict. Conflicts only occur when you have
> modified a file that is about to be merged. If you have not modified the
> file locally, then there will be no conflict.
>
> [EUAN] That may occur if tag1 contains the same files as tag2
>
>
> Objective 2 seems to conflict with Caveat 1. How will you determine which
> files to overwrite? Also, how frequently will you do this - is this a
> one-time task, or will this be done more than once?
>
> [EUAN] A number of files will have the same tag, i.e. if you check out tag1
> you will get 20 files. This will be done weekly.
>
> --
> Jim Hyslop
> Senior Software Designer
> Leitch Technology International Inc. ( http://www.leitch.com )
> Columnist, C/C++ Users Journal ( http://www.cuj.com/experts )
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/info-cvs
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/info-cvs
>
If it is needed weekly, probably you want to create a script to do this.
cvs rtag BIG_TAG <base module>
cvs rtag -F -rTag1 BIG_TAG <list of files>
cvs rtag -F -rTag2 BIG_TAG <list of other files>
.
.
.
cvs co -rBIG_TAG <base module>
--Russ
- RE: Checkout's over checkouts., (continued)
- RE: Checkout's over checkouts., Rick Genter, 2005/03/29
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/29
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/29
- RE: Checkout's over checkouts., Rick Genter, 2005/03/29
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/29
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/29
- RE: Checkout's over checkouts., Rick Genter, 2005/03/29
- RE: Checkout's over checkouts., Euan Guttridge, 2005/03/29
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/29
- RE: Checkout's over checkouts., Euan Guttridge, 2005/03/29
- Re: Checkout's over checkouts.,
Russ Sherk <=
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/29
- RE: Checkout's over checkouts., Euan Guttridge, 2005/03/30
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/30
- RE: Checkout's over checkouts., Euan Guttridge, 2005/03/30
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/30
- RE: Checkout's over checkouts., Euan Guttridge, 2005/03/30
- RE: Checkout's over checkouts., Jim.Hyslop, 2005/03/30
- RE: Checkout's over checkouts., Euan Guttridge, 2005/03/30