[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: removing from trunk/branch
From: |
Garg, Sukh |
Subject: |
RE: removing from trunk/branch |
Date: |
Thu, 4 Oct 2001 11:37:52 -0400 |
Hi,
This is not a reply to ur query rather i am posting u a query. Bcoz i
thought what u have done i need to achieve almost the same. So pls help me
out.
File: browse.jsp Status: Up-to-date
Working revision: 1.1.1.1
Repository revision: 1.1.1.1 /cvs/NewJSP/src/products/browse.jsp,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: -kb
Existing Tags:
NewJSP-2001_10_01-Branch1 (branch: 1.1.1.1.2)
NewJSP-2001_10_01-Tag1 (revision: 1.1.1.1)
NewJSP_Rel_1 (revision: 1.1.1.1)
init (revision: 1.1.1.1)
start (branch: 1.1.1)
Above output is a result of "cvs status -v" command for my prj.
1. everything whatever i did, i did it from client WinNT.(CVS server is
Unix)
Tagging is done using rtag i.e "cvs rtag tagName moduleName"
Branching is done using rtag i.e "cvs rtag -b -r tagName branchName
moduleName"
Now questions :
1. Is my approach for Tagging & branching OK???
2. If it's Ok then why changes made on Main Trunk are visible on Branch as
well.Though i never merged main trunk with branch.
So pls suggest me what's wrong.
thanx
sukh
-----Original Message-----
From: Rob Helmer [mailto:address@hidden
Sent: Wednesday, October 03, 2001 1:40 PM
To: address@hidden
Subject: removing from trunk/branch
Hello,
I've recently done a merge ( branch -> trunk ) and noticed
that alot of files were removed from the branch, but not
from the trunk.
I ran a cvs log and pulled up filenames for all files in a
"dead" state, which is somewhat tedious to go through,
but works ( I can tell from the commit messages whether
it had a dead revision because it was added on the branch,
or whether it was purposely removed from the branch ).
So I have a couple questions :
Is there a single command I can use to remove files from
both the trunk and the branch? "cvs remove" doesn't seem
to take many parameters.
Also, is this the right way to go about this? I basically
want to take all the work done on the branch the last couple
months, and move it to the trunk ( where seperate, but "unstable"
work has been happening ).
How should I deal with these files removed on the branch only?
Thanks,
Rob Helmer
_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs