Re: [Flightgear-devel] CVS and branch development
Hmm, Sorry about that. I had a quick look into the cvs commit logs at the time you asked. It turned out to be too quick ... On Dienstag 05 Oktober 2004 16:48, Jon Berndt wrote: > Well, I've just about had it with cvs branches. I tagged some files in a > branch, then moved to a test directory and checked out that branch, but > only got the branch-tagged files. I needed all of the files, except I > wanted the updated files on the specified branch. Tag the whole tree. > One thing that makes this difficult is that it seems as though cvs at > sourceforge has a lag. What I check in is not what I can check until a few > hours later. Use your usual cvs tools for getting information about the tree. This one uses the developer cvs server. > I am trying to develop the new XML capability in JSBSim. There are some new > files that I have checked in that are new and do not need to be on a new > branch. But, there are some that are currently used and I do not want to > commit these to the HEAD branch until the whole set of changes is done. > However, CVS using branches is giving me a big headache - it seems to work > differently than I expect it to. I'm not sure what to do. Suggestions > welcome. Go back to that date you have started your work. Check out that version. You can do that with cvs co -D 'My start date of work' JSBSim Check that version into HEAD. Then create a new branch with for the *whole* tree. Check that out into a *seperate* directory. Do here your branch work. Use an other directory for doing non branch work. There is also useful information about cvs available at: https://ccvs.cvshome.org/fom//cache/1.html Greetings Mathias -- Mathias Fröhlich, email: [EMAIL PROTECTED] ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> If I where you, I would tag the whole tree so that I wouldn't have to > remember what are files that need to be in the branch and those that > are not. cvs do a good job when adding or removing solely in the branch. Sounds like a good idea. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
I incorrectly wrote: > If I where you, ... Oops, bad english: I meant 'If I was you, ...' -Fred ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
Jon Berndt wrote: > Well, I've just about had it with cvs branches. I tagged some files in a > branch, then > moved to a test directory and checked out that branch, but only got the > branch-tagged > files. I needed all of the files, except I wanted the updated files on the > specified > branch. use the -f option for cvs update to get the head if the tag is not present. > One thing that makes this difficult is that it seems as though cvs at > sourceforge has a > lag. What I check in is not what I can check until a few hours later. Use your developer account ( :ext2:... ) instead of the anonymous one ( :pserver: ) > I am trying to develop the new XML capability in JSBSim. There are some new > files that I > have checked in that are new and do not need to be on a new branch. But, > there are some > that are currently used and I do not want to commit these to the HEAD branch > until the > whole set of changes is done. However, CVS using branches is giving me a big > headache - it > seems to work differently than I expect it to. I'm not sure what to do. > Suggestions > welcome. Branches are tought so I preferably assign them to directory instead of simple files. Unfortunately, jsbsim files are located in the cvs root folder, not in an src folder. It is easy to create a mess when managing simple files, and this is why I recommend using a visual tool such as WinCVS or its counterpart on Linux or anything else. If I where you, I would tag the whole tree so that I wouldn't have to remember what are files that need to be in the branch and those that are not. cvs do a good job when adding or removing solely in the branch. -Fred ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
Well, I've just about had it with cvs branches. I tagged some files in a branch, then moved to a test directory and checked out that branch, but only got the branch-tagged files. I needed all of the files, except I wanted the updated files on the specified branch. One thing that makes this difficult is that it seems as though cvs at sourceforge has a lag. What I check in is not what I can check until a few hours later. I am trying to develop the new XML capability in JSBSim. There are some new files that I have checked in that are new and do not need to be on a new branch. But, there are some that are currently used and I do not want to commit these to the HEAD branch until the whole set of changes is done. However, CVS using branches is giving me a big headache - it seems to work differently than I expect it to. I'm not sure what to do. Suggestions welcome. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
Jon Berndt wrote : > > > How does one create a branch? I know how to tag changed files locally: > > > > > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > > > Is that what you mean? > > > > This is for creating a branch. Then you have to tell that you are > > working on it by doing : > > > > cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > check with : > > > > cvs status FGAircraft.cpp FGAircraft.h > > > > you should see JSB_New_XML as a sticky tag. > > > > -Fred > > I did that, and saw the sticky tag. I believe JSBSim CVS is now in a good > state. I tagged > my local copy of all the "good" files with PRIOR_TO_NEW_XML_FORMAT. Then, I > copied into my > local directories the new files that are being modified for the new XML > capability, and > tagged then with a branch tag (-b option) JSB_New_XML. Then, I did the cvs > update as you > specified. > > Now the question I have is how do I commit my local work so that it is on a > branch in the > CVS repository? If I simply do a cvs commit does that commit my local changed > files (that > have been tagged with a branch tag) into CVS on a branch - not on HEAD? The commit will happened in the branch specified by the sticky tag you are seeing by doing cvs status. If you did cvs add in a directory, the file will get the last tag used to update or check out the directory. You are working on Windows, right ? So I advise you to use WinCVS instead of the bare command line tools. This way you'll see instantaneously what are the current sticky tags ( or date if you used the -D option ). You can download it at http://www.wincvs.org/ . It has dialog for all available option and is very easy to use, and doesn't prevent you to use the command line whenever you want. -Fred ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> > How does one create a branch? I know how to tag changed files locally: > > > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > Is that what you mean? > > This is for creating a branch. Then you have to tell that you are > working on it by doing : > > cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h > > check with : > > cvs status FGAircraft.cpp FGAircraft.h > > you should see JSB_New_XML as a sticky tag. > > -Fred I did that, and saw the sticky tag. I believe JSBSim CVS is now in a good state. I tagged my local copy of all the "good" files with PRIOR_TO_NEW_XML_FORMAT. Then, I copied into my local directories the new files that are being modified for the new XML capability, and tagged then with a branch tag (-b option) JSB_New_XML. Then, I did the cvs update as you specified. Now the question I have is how do I commit my local work so that it is on a branch in the CVS repository? If I simply do a cvs commit does that commit my local changed files (that have been tagged with a branch tag) into CVS on a branch - not on HEAD? Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
On Mon, 04 Oct 2004 21:24:33 +0200, Erik wrote in message <[EMAIL PROTECTED]>: > Arnt Karlsen wrote: > > > ..but the idea can be inverted: Maybe a cvs signature file to flag > > off stuff you're happy with? So I just set my script to check for > > that new flag file, and on its absense, "just do cvs co to last > > Saturday night"? > > In situations like that one is way too busy fixing stuff to bother > about others. Sorry about that. ..I said "on its absense", the idea is you fix stuff first, then set the new "Ok, I'm happy" flag. ..but true, another way could be chk whether or not any of you guys are working on the cvs server to fix stuff like this. ..it has to be automated anyway. Checking the history section in the manual. -- ..med vennlig hilsen = with Kind Regards from Arnt... ;-) ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
Arnt Karlsen wrote: ..but the idea can be inverted: Maybe a cvs signature file to flag off stuff you're happy with? So I just set my script to check for that new flag file, and on its absense, "just do cvs co to last Saturday night"? In situations like that one is way too busy fixing stuff to bother about others. Sorry about that. Erik ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
On Mon, 4 Oct 2004 11:16:28 -0500, Jon wrote in message <[EMAIL PROTECTED]>: > > > ..meanwhile, is there a "go-away" flag that can be set to prevent > > > us mortals and not from cvs co'ing known bad code trees? > > > > No because this repository is located at Sourceforge and there is no > > way to shutdown the repository during this maintenance operation. > > > > -Fred > > I'll try and get this fixed today. In teh meantime, checkout JSBSim > CVS only based on data, from say, last Saturday night. That should be > fine. ..ok. I'm asking because I'm pondering an automatic build script that I'd like to abort in situations like this, when cvs co, building etc is pointless. ..but the idea can be inverted: Maybe a cvs signature file to flag off stuff you're happy with? So I just set my script to check for that new flag file, and on its absense, "just do cvs co to last Saturday night"? -- ..med vennlig hilsen = with Kind Regards from Arnt... ;-) ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> > ..meanwhile, is there a "go-away" flag that can be set to prevent > > us mortals and not from cvs co'ing known bad code trees? > > No because this repository is located at Sourceforge and there is no > way to shutdown the repository during this maintenance operation. > > -Fred I'll try and get this fixed today. In teh meantime, checkout JSBSim CVS only based on data, from say, last Saturday night. That should be fine. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
Arnt Karlsen wrote: > On Mon, 4 Oct 2004 16:47:12 +0200, Frederic wrote in message > <[EMAIL PROTECTED]>: > > > Jon Berndt wrote: > > > > > > > > Just for the record: > > > > > > - Creating that new branch. > > > > > > > > > > How does one create a branch? I know how to tag changed files > > > > > locally: > > > > > > > > > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > > > > > > > Is that what you mean? > > > > > > > > This is for creating a branch. Then you have to tell that you are > > > > working on it by doing : > > > > > > > > cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > > > > > check with : > > > > > > > > cvs status FGAircraft.cpp FGAircraft.h > > > > > > > > you should see JSB_New_XML as a sticky tag. > > > > > > > > -Fred > > > > > > Is there a good way to revert the HEAD branch of CVS to yesterday > > morning's set of files? > > > > If I recall correctly, "cvs admin -o filename" will kill the so > > called revision. > > For example, "cvs admin -o1.42 foo.cxx" remove revision 1.42 of > > foo.cxx. But look at the cvs manual before proceeding > > ..meanwhile, is there a "go-away" flag that can be set to prevent > us mortals and not from cvs co'ing known bad code trees? No because this repository is located at Sourceforge and there is no way to shutdown the repository during this maintenance operation. -Fred ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
On Mon, 4 Oct 2004 16:47:12 +0200, Frederic wrote in message <[EMAIL PROTECTED]>: > Jon Berndt wrote: > > > > > > Just for the record: > > > > > - Creating that new branch. > > > > > > > > How does one create a branch? I know how to tag changed files > > > > locally: > > > > > > > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > > > > > Is that what you mean? > > > > > > This is for creating a branch. Then you have to tell that you are > > > working on it by doing : > > > > > > cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > > > check with : > > > > > > cvs status FGAircraft.cpp FGAircraft.h > > > > > > you should see JSB_New_XML as a sticky tag. > > > > > > -Fred > > > > Is there a good way to revert the HEAD branch of CVS to yesterday > morning's set of files? > > If I recall correctly, "cvs admin -o filename" will kill the so > called revision. > For example, "cvs admin -o1.42 foo.cxx" remove revision 1.42 of > foo.cxx. But look at the cvs manual before proceeding ..meanwhile, is there a "go-away" flag that can be set to prevent us mortals and not from cvs co'ing known bad code trees? -- ..med vennlig hilsen = with Kind Regards from Arnt... ;-) ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
Jon Berndt wrote: > > > > Just for the record: > > > > - Creating that new branch. > > > > > > How does one create a branch? I know how to tag changed files locally: > > > > > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > > > Is that what you mean? > > > > This is for creating a branch. Then you have to tell that you are > > working on it by doing : > > > > cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > check with : > > > > cvs status FGAircraft.cpp FGAircraft.h > > > > you should see JSB_New_XML as a sticky tag. > > > > -Fred > > Is there a good way to revert the HEAD branch of CVS to yesterday morning's set of files? If I recall correctly, "cvs admin -o filename" will kill the so called revision. For example, "cvs admin -o1.42 foo.cxx" remove revision 1.42 of foo.cxx. But look at the cvs manual before proceeding -Fred ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> > > Just for the record: > > > - Creating that new branch. > > > > How does one create a branch? I know how to tag changed files locally: > > > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > > > Is that what you mean? > > This is for creating a branch. Then you have to tell that you are > working on it by doing : > > cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h > > check with : > > cvs status FGAircraft.cpp FGAircraft.h > > you should see JSB_New_XML as a sticky tag. > > -Fred Is there a good way to revert the HEAD branch of CVS to yesterday morning's set of files? Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
Jon Berndt wrote: > > Just for the record: > > - Creating that new branch. > > How does one create a branch? I know how to tag changed files locally: > > cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h > > Is that what you mean? This is for creating a branch. Then you have to tell that you are working on it by doing : cvs update -r JSB_New_XML FGAircraft.cpp FGAircraft.h check with : cvs status FGAircraft.cpp FGAircraft.h you should see JSB_New_XML as a sticky tag. -Fred ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> Hi Jon, > > On Sonntag 03 Oktober 2004 16:06, Jon Berndt wrote: > > I am trying to save to JSBSim CVS some files I have modified for reading > > the new JSBSim XML format. These files should not be part of the main > > (HEAD) branch at the moment. I'm not sure I have done this correctly. Can a > > CVS expert inform me what the correct procedure is to tag a subset of files > > with a branch tag, store them in CVS, and then commit changes as they are > > made? Also, I would need to know how to merge or commit changes from the > > branch to the main HEAD line upon completion of development. > If I look at your last checkin, you already did that right. Something did not work correctly. All my commits went to the HEAD branch. Crap! I've got some stuff to undo, now. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> Just for the record: > - Creating that new branch. How does one create a branch? I know how to tag changed files locally: cvs tag -b JSB_New_XML FGAircraft.cpp FGAircraft.h Is that what you mean? jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
RE: [Flightgear-devel] CVS and branch development
> Hi Jon, > If I look at your last checkin, you already did that right. > > Just for the record: > - Creating that new branch. > - Checking out the new branch with cvs co -r > - Work as usual within that newly checked out directory. Everything you do in > that directory is done on that branch (branch tags are sticky). > > For merging changes from HEAD I use the following procedure: > First I create a tag in the HEAD branch when I did the past changes. You can > do that in a directory with the checked out HEAD with: > > cvs tag LAST-MERGE-TO-XML Thanks. I will refer to this as time goes on. Now here's another question: If a person wants to check on the HEAD version, but wants the changed versions now also in the branch JSB_New_XML? I guess one would check out the HEAD version, then update from the JSB_New_XML branch? Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
Re: [Flightgear-devel] CVS and branch development
Hi Jon, On Sonntag 03 Oktober 2004 16:06, Jon Berndt wrote: > I am trying to save to JSBSim CVS some files I have modified for reading > the new JSBSim XML format. These files should not be part of the main > (HEAD) branch at the moment. I'm not sure I have done this correctly. Can a > CVS expert inform me what the correct procedure is to tag a subset of files > with a branch tag, store them in CVS, and then commit changes as they are > made? Also, I would need to know how to merge or commit changes from the > branch to the main HEAD line upon completion of development. If I look at your last checkin, you already did that right. Just for the record: - Creating that new branch. - Checking out the new branch with cvs co -r - Work as usual within that newly checked out directory. Everything you do in that directory is done on that branch (branch tags are sticky). For merging changes from HEAD I use the following procedure: First I create a tag in the HEAD branch when I did the past changes. You can do that in a directory with the checked out HEAD with: cvs tag LAST-MERGE-TO-XML This is an initial procedure which should be done with the HEAD revision used to create the new branch. When I merge, I create a temporary tag on HEAD with cvs tag LAST-MERGE-TO-XML-TMP In your development directory for the XML branch you can then leave most work to cvs. It will incorporate the changes between the tags LAST-MERGE-TO-XML and LAST-MERGE-TO-XML-TMP by cvs up -jLAST-MERGE-TO-XML -jLAST-MERGE-TO-XML-TMP cvs even cares for cvs add's of new files ... Check for conflicts, resolve them and check that in. Then I move the LAST-MERGE-TO-XML tag to the LAST-MERGE-TO-XML-TMP to get that right for the next time I will merge changes. Again in the directory with the HEAD branch checked out: cvs tag -d LAST-MERGE-TO-XML # remove old tag. cvs tag -r LAST-MERGE-TO-XML-TMP LAST-MERGE-TO-XML # tag where tmp tag is cvs tag -d LAST-MERGE-TO-XML-TMP # remove tmp tag Thats it. If you want to merge changes from the branch to HEAD. You can do the same with changed roles of the branches. Greetings Mathias -- Mathias Fröhlich, email: [EMAIL PROTECTED] ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
