=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- src/usr.bin/cvs/commit.c 2007/09/24 13:56:09 1.113 +++ src/usr.bin/cvs/commit.c 2007/10/03 13:12:06 1.114 @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.113 2007/09/24 13:56:09 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.114 2007/10/03 13:12:06 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2006 Xavier Santolaria @@ -289,6 +289,11 @@ crev = NULL; rrev = NULL; + if (cf->file_rcs->rf_branch != NULL) { + rcsnum_free(cf->file_rcs->rf_branch); + cf->file_rcs->rf_branch = NULL; + } + if (cf->file_status == FILE_MODIFIED || cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) { @@ -416,11 +421,6 @@ if (cf->file_status == FILE_REMOVED) { if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1) fatal("cvs_commit_local: failed to set state"); - } - - if (cf->file_rcs->rf_branch != NULL) { - rcsnum_free(cf->file_rcs->rf_branch); - cf->file_rcs->rf_branch = NULL; } if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {