From: Thomas W. <th...@xs...> - 2001-09-03 23:26:27
|
On Mon, Sep 03, 2001 at 05:09:40PM -0500, Peter Hutnick wrote: > Anyone know what this means? > cvs server: sticky tag `rel-1_1_3' for file `src/load_prefs.php' is not a branch > cvs [server aborted]: correct above errors first! > cvs commit: saving log message in /tmp/cvsJySQq0 You checked out the file 'src/load_prefs.php' using the sticky tag 'rel-1_1_3', meaning you probably checked out the entire tree using 'co -rrel-1_1_3' or 'up -rrel-1_1_3'. However, that tag isn't a branch tag, so you can't commit changes to it. If you want a branch you need a branch tag (a tag of which the corresponding revision number has an even number of dots), which (as far as I can see) the SM CVS tree has exactly none of. If you just want to commit your changes into the head of the tree (aka the 'trunk'), removing the sticky tag(s) should be enough. You almost certainly want to remove the sticky tag from the entire tree, because you won't see the changes anyone else made if you keep them. You can remove the tags by doing 'cvs update -A' at the top level of your CVS tree. > I get this after doing cvs commit src/load_prefs.php, after writing the log > entry (I'm exiting by :wq, is that right?). No, that means you're using the Wrong Editor. Try using '^K^X' :-) -- Thomas Wouters <th...@xs...> Hi! I'm a .signature virus! copy me into your .signature file to help me spread! |