Well this is exactly the manner that I used PVCS another SCS a commercial from merant that I'm sure many listees have encountered.
Now the needs/challeneges of my teams are probably not as great as open source development. But I was thinking in concept you should be able to create a branch for each patch and track the patch as that branch. -Daniel -----Original Message----- From: Byrne, Steven [mailto:[EMAIL PROTECTED]] Sent: Monday, October 07, 2002 5:05 PM To: Struts Developers List Subject: RE: Selective diff? Well, yeah, you actually might want to make a branch for just that reason: CVS gives you the ability to produce diffs between versions. Assuming Eddie was empowered create such a branch (OT!), then he could check in his changes to that branch. He, or others (since its a visible branch), could pull changes into the main line selectively, and could make CVS diffs for a specific change that was needed to add that to a bug report or whatever by using the "diff between specific versions" capability. Successive changes to the same branch work fine, and can be diffed either individually, or collectively. Now I realize that this is a little far fetched in some ways, because I think if he were able to create and write to a branch, he would be able to write to the mainline as well. So it's somewhat not sensible, UNLESS CVS provides a way to allow for differential access controls to branches versus the mainline (I have a vauge feeling that it does, but I haven't checked). If it did, this would be an interesting alternative to the current practice os attaching diffs to the bug report, as people could just create a branch and put their changes into it. Committers could pull the changes from that branch over into the mainline when desired. Since the branch is made with respect to a specific version of the file(s) in question, the "bit rot" that sets in when there's a long time between when a patch is created and when it's integrated can be avoided as the integrator can see exactly how the patch looked wrt the file at the time it was created, as well as how it might appear currently. Ok, so I'm probably smoking crack with this whole idea -- anyone know for sure if CVS specifically disallows this kind of "commit on a branch only" privilege? Steve > -----Original Message----- > From: Martin Cooper [mailto:[EMAIL PROTECTED]] > Sent: Monday, October 07, 2002 1:48 PM > To: 'Struts Developers List' > Subject: RE: Selective diff? > > > > > > -----Original Message----- > > From: Daniel Honig [mailto:[EMAIL PROTECTED]] > > Sent: Monday, October 07, 2002 12:44 PM > > To: Struts Developers List > > Subject: RE: Selective diff? > > > > > > Just for my own curiosity is it possible to solve > > this problem by branching the module that contains the patch? > > > > You would have a nasty time merging it back togehter, but > > this is better than having a copy of the entire tree locally > > for each patch? > > > > Isn't this what branching is for? Am I missing something? > > No, this is not what branching is for. Branching is used to maintain > multiple versions of the code in the CVS repository. What > Eddie is trying to > do is create diffs for patches to the code. You wouldn't want > to be making > changes to the repository just to prepare patch files. > > -- -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]> -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
