cvs/src/commit.c

64 static void fixbranch PROTO((RCSNode *, char *branch));
102     "    -r rev      Commit to this branch or trunk revision.\n",
783 	     * up-to-date with the head of the specified branch.
886 	     *	- can't have a sticky tag that is not a branch
891 	     *    a branch or head is dead
911 			   "sticky tag `%s' for file `%s' is not a branch",
1242     /* Keep track of whether write_dirtag is a branch tag.
1243        Note that if it is a branch tag in some files and a nonbranch tag
1313 	/* adding files with a tag, now means adding them on a branch.
1314 	   Since the branch test was done in check_fileproc for
1630     int branch;
1646     branch = 0;
1647     if (tag && !(branch = RCS_nodeisbranch (finfo->rcs, tag)))
1663     /* we are removing the file from either the head or a branch */
1673     if (branch)
1680 	    error (0, 0, "cannot find branch \"%s\".", tag);
1687 	    /* no revision exists on this branch.  use the previous
1699     } else  /* Not a branch */
1705     /* if removing without a tag or a branch, then make sure the default
1706        branch is the trunk. */
1707     if (!tag && !branch)
1711 	    error (0, 0, "cannot change branch to default for %s",
1730     /* Except when we are creating a branch, lock the revision so that
1762     if (!branch)
1862  * put the branch back on an rcs file
1865 fixbranch (rcs, branch)
1867     char *branch;
1871     if (branch != NULL)
1873 	if ((retcode = RCS_setbranch (rcs, branch)) != 0)
1875 		   "cannot restore branch to %s for %s", branch, rcs->path);
1890  *   tag	The name or rev num of the branch being added to, if any.
2065 	       committed on a branch.  */
2115 	    (void) sprintf (tmp, "file %s was initially added on branch %s.",
2151 	/* when adding with a tag, we need to stub a branch, if it
2155 	    /* branch does not exist.  Stub it.  */
2173 	    /* If this is not a new branch, then we will want a dead
2187 		       "could not stub branch %s for %s", tag, rcs->path);
2216 			       "file %s was added on branch %s on %d-%02d-%02d %02d:%02d:%02d +0000",
2256 	    /* lock the branch. (stubbed branches need not be locked.)  */
2302  * couldn't.  If the RCS file currently has a branch as the head, we must
2304  * put the branch back as the head if there are any errors.
2313     char *branch = NULL;
2318      * no revision is specified ""), definitely move the branch to the trunk
2322      * the head points to the trunk, not a branch... and as such, it's not
2328 	branch = xstrdup (rcs->branch);
2329 	if (branch != NULL)
2333 		error (0, 0, "cannot change branch to default for %s",
2335 		if (branch)
2336 		    free (branch);
2370 	sbranch = branch;
2374     /* try to restore the branch if we can on error */
2375     if (branch != NULL)
2376 	fixbranch (rcs, branch);
2378     if (branch)
2379 	free (branch);