[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Merging trunk changes on to the Branch.
From: |
Dale . Miller |
Subject: |
RE: Merging trunk changes on to the Branch. |
Date: |
Mon, 13 May 2002 10:51:49 -0500 |
Sally,
I believe all Team S needs to do to get Team P trunk changes is
cvs update -j HEAD
They should not have to use two -j entries.
This should update their branch in their work area to include
the changes from the main trunk.
Dale Miller
> -----Original Message-----
> From: Miller Sally S NPRI [mailto:address@hidden
> Sent: Monday, May 13, 2002 10:17 AM
> To: 'address@hidden'
> Subject: Merging trunk changes on to the Branch.
>
>
> I have some developers(Team S) who want to make some
> temporary changes to the trunk but keep getting the updated
> trunk files.(made by Team P)
>
> so Team S does:
> cvs checkout projectname
> cvs rtag -b TeamS_branch
> cvs update -r TeamS_branch
> (they make the minor changes to branch and commits.)
> (Team P will not get these changes as they are on the trunk)
>
> Now Team P makes some changes on the trunk and commits them.
> Team S wants to update their branch with these changes.
>
> cvs update -r TeamS_branch
> cvs update -j TeamS_branch -j HEAD
>
> This seems to kill all the changes that Team S has done.
>
> I want the new trunk changes to be added but keep the branch changes.
>
> What am I doing wrong?
>
> Sally
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs
>