Need CVS Advice
Need CVS Advice
- Subject: Need CVS Advice
- From: Randy Bradley <email@hidden>
- Date: Tue, 2 Aug 2005 09:36:04 -0500
All,
I have two very similar applications. One for weighing cattle
and one for sheep. I thought I could make good use of branching in
CVS to ease maintaining these applications so I created a CVS
project, "Weights", and two branches off of that, "CattleWeights" and
"SheepWeights". My thoughts are that common updates could be applied
to the main trunk, "Weights" and specific features could be added to
each species branch. I would appreciate any experiences and informed
opinions. Maybe I'm way out in left field? Am I better off with two
independent cvs projects?
Also, I don't want to start a flame war, but would Subversion
handle this situation better than cvs? I gave Subversion a modest
attempt but it replied to me in French after installing with
DarwinPorts.
My first attempt went kind of like this:
bradley:~ bradley$ rm -r Weights
bradley:~ bradley$ ocvs checkout -r CattleWeights Weights
ocvs checkout: Updating Weights
U Weights/.DS_Store
U Weights/Animal.h
U Weights/Animal.m
U Weights/AppController.h
U Weights/AppController.m
... * lots of files "
I then went into Xcode, edited some files, changed some fields,
edited Weights.nib because a column had changed in a couple of
tables, changed some project settings, etc.
However, when I went to commit the changes back, I got this:
bradley:~/Weights bradley$ rm -r build
bradley:~/Weights bradley$ ocvs commit
ocvs commit: Examining .
ocvs commit: Examining English.lproj
ocvs commit: Examining English.lproj/MainMenu.nib
ocvs commit: Examining English.lproj/MainMenu~.nib
ocvs commit: Examining English.lproj/Preferences.nib
ocvs commit: Examining English.lproj/Preferences~.nib
ocvs commit: Examining English.lproj/Weights.nib
ocvs commit: Examining English.lproj/Weights~.nib
ocvs commit: in directory English.lproj/Weights~.nib:
ocvs [commit aborted]: there is no version here; do 'ocvs checkout'
first
bradley:~/Weights bradley$
Can I simply delete the file: English.lproj/Weights~.nib? It kind
of looks like a backup file from IB...
Thanks,
Randy
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Cocoa-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden