Re: Subversion conversion
Kevin L. Cobb wrote: We recently started using SVN for SCM, were using VSS. We're trying out approach A, branching off for each release. Development always develops on the trunk, except when a bug is discovered that needs to be patched to a previous version of the product. When that scenario comes up (and it never has), then the developer has to make the change to the branched version that needs to be patched and then must merge those changes into other branches and the trunk. It seems to be a cleaner approach, at least for now. Of course, for an open source project like Lucene, I'm not sure branching is necessary at all. Anyone have any other models to use for SCM, I'd love to hear them, We've tried a variety of approaches over the years, but this one seems to be the easiest to handle and least prone to errors. It's nice to see someone else has reached the same conclusion! jch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Subversion conversion
We recently started using SVN for SCM, were using VSS. We're trying out approach A, branching off for each release. Development always develops on the trunk, except when a bug is discovered that needs to be patched to a previous version of the product. When that scenario comes up (and it never has), then the developer has to make the change to the branched version that needs to be patched and then must merge those changes into other branches and the trunk. It seems to be a cleaner approach, at least for now. Of course, for an open source project like Lucene, I'm not sure branching is necessary at all. Anyone have any other models to use for SCM, I'd love to hear them, Here's some ASCII art showing our model: +--- branch release 1.2 | ---trunk|---trunk--|--trunk--|---trunk-- --- | | | +-- branch release 1.1 | + branch release 1.0 --- Kevin Cobb -Original Message- From: Chakra Yadavalli [mailto:[EMAIL PROTECTED] Sent: Wednesday, February 02, 2005 7:50 PM To: Lucene Users List Subject: Re: Subversion conversion Hello ALL, It might not be the right place for it but as we are talking about SCM, I have a quick question. First, I haven't used CVS/SVN on any project. I am a ClearCase/PVCS guy. I just would like to know WHICH CONFIGURATION MANAGEMENT PLAN DO YOU FOLLOW IN LUCENE DEVELOPMENT. PLAN A: DEVELOP IN TRUNK AND BRANCH OFF ON RELEASE Recently I had a discussion with a friend about developing in the TRUNK (which in the /main in ClearCase speak), which my friend claims that is done in the APACHE/Open Source projects. The main advantage he pointed was that Merging could be avoided if you are developing in the TRUNK. And when there is a release, they create a new Branch (say LUCENE_1.5 branch) and label them. That branch will be used for maintenance and any code deltas will be merged back to TRUNK as needed. PLAN B: BRANCH OF BEFORE PLANNED RELEASE AND MERGE BACK TO MAIN/TRUNK As I am from a "private workspace"/"isolated development" school of thought promoted by ClearCase, I am used to create a branch at the project/release initiation and develop in that branch (say /main/dev). Similarly, we have /main/int for making changes when the project goes to integration phase, and a /main/acp branch for acceptance. In this school, the /main will always have fewer versions of files and the difference between any two consecutive versions is the NET CHANGE of that SCM element (either file or dir) between two releases (say LUCENE 1.4 and 1.5). Thanks in advance for your time. Chakra Yadavalli http://jroller.com/page/cyblogue > -Original Message- > From: aurora [mailto:[EMAIL PROTECTED] > Sent: Wednesday, February 02, 2005 4:25 PM > To: lucene-user@jakarta.apache.org > Subject: Re: Subversion conversion > > Subversion rocks! > > I have just setup the Windows svn client TortoiseSVN with my favourite > file manager Total Commander 6.5. The svn status and commands are > readily > integrated with the file manager. Offline diff and revert are two things > I > really like from svn. > > > The conversion to Subversion is complete. The new repository is > > available to users read-only at: > > > > http://svn.apache.org/repos/asf/lucene/java/trunk > > > > Besides /trunk, there is also /branches and /tags. /tags contains all > > > the CVS tags made so that you could grab a snapshot of a previous > > version. /trunk is analogous to CVS HEAD. You can learn more about > the > > Apache repository configuration here and how to use the command-line > > client to check out the repository: > > > > http://www.apache.org/dev/version-control.html > > > > Learn about Subversion, including the complete O'Reilly Subversion > book > > in electronic form for free here: > > > > http://subversion.tigris.org > > > > For committers, check out the repository using https and your Apache > > username/password. > > > > The Lucene sandbox has been integrated into our single Subversion > > repository, under /java/trunk/sandbox: > > > > http://svn.apache.org/repos/asf/lucene/java/trunk/sandbox/ > > > > The Lucene CVS repositories have been locked for read-only. > > > > If there are any issues with this conversion, let me know and I'll > bring > > them to the Apache infrastructure group. > > > > Erik > > - > To unsu
Re: Subversion conversion
We can work the 1.x and 2.0 lines of code however we need to. We can branch (a branch or tag in Subversion is inexpensive and a constant time operation). How we want to manage both versions of Lucene is open for discussion. Nothing about Subversion changes how we manage this from how we'd do it with CVS. Currently the 1.x and 2.x lines of code are one and the same. Once they diverge in 2.0, it will depend on who steps up to maintain 1.x but I suspect there will be a strong interest in keeping it alive by some, but we would of course encourage everyone using 1.x upgrade to 1.9 and remove deprecation warnings. Erik On Feb 3, 2005, at 4:33 AM, Miles Barr wrote: On Wed, 2005-02-02 at 22:11 -0500, Erik Hatcher wrote: I've seen both of these types of procedures followed on Apache projects. It really just depends. Lucene's codebase is not being modified frequently, so it is not necessary to branch and merge back. Rather we simply develop off of the trunk (HEAD) and when we're ready for a release we'll just do it from the trunk. Actually we'd most likely tag and build from that tag just to be clean about it. What consequences does this have for the 1.9/2.0 releases? i.e. after 2.0 the deprecated API will be removed, does this mean 1.x will no longer be supported after 2.0? The typical scenario being a bug is found that affects 1.x and 2.x, it's patched in 2.x (i.e. the trunk) but we can't patch the last 1.x release. The other scenario being a bug is found in the 1.x code, but it cannot be applied. -- Miles Barr <[EMAIL PROTECTED]> Runtime Collective Ltd. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Subversion conversion
On Wed, 2005-02-02 at 22:11 -0500, Erik Hatcher wrote: > I've seen both of these types of procedures followed on Apache > projects. It really just depends. Lucene's codebase is not being > modified frequently, so it is not necessary to branch and merge back. > Rather we simply develop off of the trunk (HEAD) and when we're ready > for a release we'll just do it from the trunk. Actually we'd most > likely tag and build from that tag just to be clean about it. What consequences does this have for the 1.9/2.0 releases? i.e. after 2.0 the deprecated API will be removed, does this mean 1.x will no longer be supported after 2.0? The typical scenario being a bug is found that affects 1.x and 2.x, it's patched in 2.x (i.e. the trunk) but we can't patch the last 1.x release. The other scenario being a bug is found in the 1.x code, but it cannot be applied. -- Miles Barr <[EMAIL PROTECTED]> Runtime Collective Ltd. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Subversion conversion
One thing about subversion branches (from "Key Concepts Behind Branches" in chapter 4 of the subversion book): "2. Subversion has no internal concept of a branchâonly copies. When you copy a directory, the resulting directory is only a "branch" because you attach that meaning to it. You may think of the directory differently, or treat it differently, but to Subversion it's just an ordinary directory that happens to have been created by copying." On Wed, 2 Feb 2005 19:49:53 -0500, Chakra Yadavalli <[EMAIL PROTECTED]> wrote: > Hello ALL, It might not be the right place for it but as we are talking > about SCM, I have a quick question. First, I haven't used CVS/SVN on any > project. I am a ClearCase/PVCS guy. I just would like to know WHICH > CONFIGURATION MANAGEMENT PLAN DO YOU FOLLOW IN LUCENE DEVELOPMENT. > > PLAN A: DEVELOP IN TRUNK AND BRANCH OFF ON RELEASE > Recently I had a discussion with a friend about developing in the TRUNK > (which in the /main in ClearCase speak), which my friend claims that is > done in the APACHE/Open Source projects. The main advantage he pointed > was that Merging could be avoided if you are developing in the TRUNK. > And when there is a release, they create a new Branch (say LUCENE_1.5 > branch) and label them. That branch will be used for maintenance and any > code deltas will be merged back to TRUNK as needed. > > PLAN B: BRANCH OF BEFORE PLANNED RELEASE AND MERGE BACK TO MAIN/TRUNK > As I am from a "private workspace"/"isolated development" school of > thought promoted by ClearCase, I am used to create a branch at the > project/release initiation and develop in that branch (say /main/dev). > Similarly, we have /main/int for making changes when the project goes to > integration phase, and a /main/acp branch for acceptance. In this > school, the /main will always have fewer versions of files and the > difference between any two consecutive versions is the NET CHANGE of > that SCM element (either file or dir) between two releases (say LUCENE > 1.4 and 1.5). > > Thanks in advance for your time. > Chakra Yadavalli > http://jroller.com/page/cyblogue > > > -Original Message----- > > From: aurora [mailto:[EMAIL PROTECTED] > > Sent: Wednesday, February 02, 2005 4:25 PM > > To: lucene-user@jakarta.apache.org > > Subject: Re: Subversion conversion > > > > Subversion rocks! > > > > I have just setup the Windows svn client TortoiseSVN with my favourite > > file manager Total Commander 6.5. The svn status and commands are > > readily > > integrated with the file manager. Offline diff and revert are two things > > I > > really like from svn. > > > > > The conversion to Subversion is complete. The new repository is > > > available to users read-only at: > > > > > > http://svn.apache.org/repos/asf/lucene/java/trunk > > > > > > Besides /trunk, there is also /branches and /tags. /tags contains all > > > > > the CVS tags made so that you could grab a snapshot of a previous > > > version. /trunk is analogous to CVS HEAD. You can learn more about > > the > > > Apache repository configuration here and how to use the command-line > > > client to check out the repository: > > > > > > http://www.apache.org/dev/version-control.html > > > > > > Learn about Subversion, including the complete O'Reilly Subversion > > book > > > in electronic form for free here: > > > > > > http://subversion.tigris.org > > > > > > For committers, check out the repository using https and your Apache > > > username/password. > > > > > > The Lucene sandbox has been integrated into our single Subversion > > > repository, under /java/trunk/sandbox: > > > > > > http://svn.apache.org/repos/asf/lucene/java/trunk/sandbox/ > > > > > > The Lucene CVS repositories have been locked for read-only. > > > > > > If there are any issues with this conversion, let me know and I'll > > bring > > > them to the Apache infrastructure group. > > > > > > Erik > > > > - > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > -- > Visit my weblog: http://www.jroller.com/page/cyblogue > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Subversion conversion
I've seen both of these types of procedures followed on Apache projects. It really just depends. Lucene's codebase is not being modified frequently, so it is not necessary to branch and merge back. Rather we simply develop off of the trunk (HEAD) and when we're ready for a release we'll just do it from the trunk. Actually we'd most likely tag and build from that tag just to be clean about it. Erik On Feb 2, 2005, at 7:49 PM, Chakra Yadavalli wrote: Hello ALL, It might not be the right place for it but as we are talking about SCM, I have a quick question. First, I haven't used CVS/SVN on any project. I am a ClearCase/PVCS guy. I just would like to know WHICH CONFIGURATION MANAGEMENT PLAN DO YOU FOLLOW IN LUCENE DEVELOPMENT. PLAN A: DEVELOP IN TRUNK AND BRANCH OFF ON RELEASE Recently I had a discussion with a friend about developing in the TRUNK (which in the /main in ClearCase speak), which my friend claims that is done in the APACHE/Open Source projects. The main advantage he pointed was that Merging could be avoided if you are developing in the TRUNK. And when there is a release, they create a new Branch (say LUCENE_1.5 branch) and label them. That branch will be used for maintenance and any code deltas will be merged back to TRUNK as needed. PLAN B: BRANCH OF BEFORE PLANNED RELEASE AND MERGE BACK TO MAIN/TRUNK As I am from a "private workspace"/"isolated development" school of thought promoted by ClearCase, I am used to create a branch at the project/release initiation and develop in that branch (say /main/dev). Similarly, we have /main/int for making changes when the project goes to integration phase, and a /main/acp branch for acceptance. In this school, the /main will always have fewer versions of files and the difference between any two consecutive versions is the NET CHANGE of that SCM element (either file or dir) between two releases (say LUCENE 1.4 and 1.5). Thanks in advance for your time. Chakra Yadavalli http://jroller.com/page/cyblogue -Original Message- From: aurora [mailto:[EMAIL PROTECTED] Sent: Wednesday, February 02, 2005 4:25 PM To: lucene-user@jakarta.apache.org Subject: Re: Subversion conversion Subversion rocks! I have just setup the Windows svn client TortoiseSVN with my favourite file manager Total Commander 6.5. The svn status and commands are readily integrated with the file manager. Offline diff and revert are two things I really like from svn. The conversion to Subversion is complete. The new repository is available to users read-only at: http://svn.apache.org/repos/asf/lucene/java/trunk Besides /trunk, there is also /branches and /tags. /tags contains all the CVS tags made so that you could grab a snapshot of a previous version. /trunk is analogous to CVS HEAD. You can learn more about the Apache repository configuration here and how to use the command-line client to check out the repository: http://www.apache.org/dev/version-control.html Learn about Subversion, including the complete O'Reilly Subversion book in electronic form for free here: http://subversion.tigris.org For committers, check out the repository using https and your Apache username/password. The Lucene sandbox has been integrated into our single Subversion repository, under /java/trunk/sandbox: http://svn.apache.org/repos/asf/lucene/java/trunk/sandbox/ The Lucene CVS repositories have been locked for read-only. If there are any issues with this conversion, let me know and I'll bring them to the Apache infrastructure group. Erik - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- Visit my weblog: http://www.jroller.com/page/cyblogue - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Subversion conversion
Hello ALL, It might not be the right place for it but as we are talking about SCM, I have a quick question. First, I haven't used CVS/SVN on any project. I am a ClearCase/PVCS guy. I just would like to know WHICH CONFIGURATION MANAGEMENT PLAN DO YOU FOLLOW IN LUCENE DEVELOPMENT. PLAN A: DEVELOP IN TRUNK AND BRANCH OFF ON RELEASE Recently I had a discussion with a friend about developing in the TRUNK (which in the /main in ClearCase speak), which my friend claims that is done in the APACHE/Open Source projects. The main advantage he pointed was that Merging could be avoided if you are developing in the TRUNK. And when there is a release, they create a new Branch (say LUCENE_1.5 branch) and label them. That branch will be used for maintenance and any code deltas will be merged back to TRUNK as needed. PLAN B: BRANCH OF BEFORE PLANNED RELEASE AND MERGE BACK TO MAIN/TRUNK As I am from a "private workspace"/"isolated development" school of thought promoted by ClearCase, I am used to create a branch at the project/release initiation and develop in that branch (say /main/dev). Similarly, we have /main/int for making changes when the project goes to integration phase, and a /main/acp branch for acceptance. In this school, the /main will always have fewer versions of files and the difference between any two consecutive versions is the NET CHANGE of that SCM element (either file or dir) between two releases (say LUCENE 1.4 and 1.5). Thanks in advance for your time. Chakra Yadavalli http://jroller.com/page/cyblogue > -Original Message- > From: aurora [mailto:[EMAIL PROTECTED] > Sent: Wednesday, February 02, 2005 4:25 PM > To: lucene-user@jakarta.apache.org > Subject: Re: Subversion conversion > > Subversion rocks! > > I have just setup the Windows svn client TortoiseSVN with my favourite > file manager Total Commander 6.5. The svn status and commands are > readily > integrated with the file manager. Offline diff and revert are two things > I > really like from svn. > > > The conversion to Subversion is complete. The new repository is > > available to users read-only at: > > > > http://svn.apache.org/repos/asf/lucene/java/trunk > > > > Besides /trunk, there is also /branches and /tags. /tags contains all > > > the CVS tags made so that you could grab a snapshot of a previous > > version. /trunk is analogous to CVS HEAD. You can learn more about > the > > Apache repository configuration here and how to use the command-line > > client to check out the repository: > > > > http://www.apache.org/dev/version-control.html > > > > Learn about Subversion, including the complete O'Reilly Subversion > book > > in electronic form for free here: > > > > http://subversion.tigris.org > > > > For committers, check out the repository using https and your Apache > > username/password. > > > > The Lucene sandbox has been integrated into our single Subversion > > repository, under /java/trunk/sandbox: > > > > http://svn.apache.org/repos/asf/lucene/java/trunk/sandbox/ > > > > The Lucene CVS repositories have been locked for read-only. > > > > If there are any issues with this conversion, let me know and I'll > bring > > them to the Apache infrastructure group. > > > > Erik > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > -- Visit my weblog: http://www.jroller.com/page/cyblogue - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Subversion conversion
Subversion rocks! I have just setup the Windows svn client TortoiseSVN with my favourite file manager Total Commander 6.5. The svn status and commands are readily integrated with the file manager. Offline diff and revert are two things I really like from svn. The conversion to Subversion is complete. The new repository is available to users read-only at: http://svn.apache.org/repos/asf/lucene/java/trunk Besides /trunk, there is also /branches and /tags. /tags contains all the CVS tags made so that you could grab a snapshot of a previous version. /trunk is analogous to CVS HEAD. You can learn more about the Apache repository configuration here and how to use the command-line client to check out the repository: http://www.apache.org/dev/version-control.html Learn about Subversion, including the complete O'Reilly Subversion book in electronic form for free here: http://subversion.tigris.org For committers, check out the repository using https and your Apache username/password. The Lucene sandbox has been integrated into our single Subversion repository, under /java/trunk/sandbox: http://svn.apache.org/repos/asf/lucene/java/trunk/sandbox/ The Lucene CVS repositories have been locked for read-only. If there are any issues with this conversion, let me know and I'll bring them to the Apache infrastructure group. Erik - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Subversion conversion
On Wednesday 02 February 2005 21:20, Erik Hatcher wrote: > The conversion to Subversion is complete. The new repository is > available to users read-only at: > > http://svn.apache.org/repos/asf/lucene/java/trunk > Great. I just checked out the trunk: Checked out revision 151042. So much for the few minutes instead of hours, Paul Elschot. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Subversion conversion
The conversion to Subversion is complete. The new repository is available to users read-only at: http://svn.apache.org/repos/asf/lucene/java/trunk Besides /trunk, there is also /branches and /tags. /tags contains all the CVS tags made so that you could grab a snapshot of a previous version. /trunk is analogous to CVS HEAD. You can learn more about the Apache repository configuration here and how to use the command-line client to check out the repository: http://www.apache.org/dev/version-control.html Learn about Subversion, including the complete O'Reilly Subversion book in electronic form for free here: http://subversion.tigris.org For committers, check out the repository using https and your Apache username/password. The Lucene sandbox has been integrated into our single Subversion repository, under /java/trunk/sandbox: http://svn.apache.org/repos/asf/lucene/java/trunk/sandbox/ The Lucene CVS repositories have been locked for read-only. If there are any issues with this conversion, let me know and I'll bring them to the Apache infrastructure group. Erik - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
