Re: Need CVS Advice
Re: Need CVS Advice
- Subject: Re: Need CVS Advice
- From: Jim Hamilton <email@hidden>
- Date: Tue, 2 Aug 2005 11:54:38 -0400
On Aug 2, 2005, at 10:36 AM, Randy Bradley wrote:
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?
Probably, but you don't need a separate copy of all files--just the
ones that change. Alternatively, you might consider separate targets
within the same (Xcode) project, in a single CVS project. (You can
have project files be part of one or more targets; see the Xcode docs.)
[snipped question about CVS vs. SubVersion, because I don't know
enough about the latter to answer]
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...
[Ah! Back on-topic!] <name>~.nib is indeed a backup file, saved by
IB. The main thing you want to do is NOT add that nib (directory) to
your CVS repository. The problem is, the CVS directory inside the
<name>~.nib directory gets removed on each save. (No, I'm not
counting on this, I'm just stating what happens...) This makes it
impossible to save the backup file in CVS; of course, you really
don't need to--that's the whole point of source code control.
There's a preference in IB to turn off saving the backup (in the
"General" tab). That should take care of things for now, but you
would need to delete those backups again any time you do a new
checkout ("cvs checkout" or "cvs update -d").
It's possible to remove it from your repository, if you know exactly
what you're doing, but you probably don't want to spend the time
learning to be a CVS administrator. If you _have_ a CVS
administrator, you can ask him/her to remove those directories for you.
hth,
Jim H
--
Jim Hamilton
email@hidden
email@hidden
_______________________________________________
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