From 2a132f99752567ba221334891cdd6827b3e76e00 Mon Sep 17 00:00:00 2001
From: joris <joris@openbsd.org>
Date: Sat, 27 May 2006 14:05:53 +0000
Subject: dont allow commit to continue if the file that is being commited
 needs to be updated or merged first.

---
 usr.bin/cvs/commit.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'usr.bin/cvs/commit.c')

diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index e9ea8d0e3e9..524c7babee9 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commit.c,v 1.56 2006/05/27 06:16:14 joris Exp $	*/
+/*	$OpenBSD: commit.c,v 1.57 2006/05/27 14:05:53 joris Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -115,6 +115,13 @@ cvs_commit_check_conflicts(struct cvs_file *cf)
 	    cf->file_status == FILE_UNLINK)
 		conflicts_found++;
 
+	if (cf->file_status == FILE_MERGE ||
+	    cf->file_status == FILE_PATCH) {
+		cvs_log(LP_ERR, "conflict: %s is not up-to-date",
+		    cf->file_path);
+		conflicts_found++;
+	}
+
 	if (cf->file_status == FILE_ADDED ||
 	    cf->file_status == FILE_REMOVED ||
 	    cf->file_status == FILE_MODIFIED)
-- 
cgit v1.2.3-59-g8ed1b