[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
cvs conflict question
From: |
Ahmed Adda-berkane |
Subject: |
cvs conflict question |
Date: |
Thu, 17 Oct 2013 15:34:05 -0700 (PDT) |
Hi all,
I'm using jenkins to remotely checkout cvs modules and perfome a build on the
remote server. To perfomr all this, Jenkins calls up a bash script that
performs cvs update and build the modules on the remote machine. Now upon
updating modules, cvs complain about some files conflict and hence causing the
build to abort and fail. But if i perfom the same update manually by sshing to
the linux box, i do not have any issues. So i'm not sure where and what's
causing this.....Here is the cvs cmd i'm using
cvs up -d -r sometag module
Is there a way how to force an update and ignore these conflicts. Because the
files in CVSROOT and the workspace are the same.
Any help will be greatly appreciated.
Ahmed
- cvs conflict question,
Ahmed Adda-berkane <=