cvs conflict question

4 views
Skip to first unread message

Ahmed Adda-berkane

unread,
Oct 17, 2013, 7:08:19 PM10/17/13
to info...@gnu.org
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

Arthur Barrett

unread,
Oct 22, 2013, 8:37:06 PM10/22/13
to Ahmed Adda-berkane, info...@gnu.org
Ahmed,

> Is there a way how to force an update and ignore these
> conflicts. Because the files in CVSROOT and the workspace are
> the same.

No - you need to get to the root cause of the conflict.

If the conflict is not happening elsewhere then it may be resolved by
simlpy deleting the existing sandbox and doing a clean checkout. Also
check that you are using the same version/release of CVS on the build
machine as you are in your test sandbox.

Regards,


Arthur Barrett

Reply all
Reply to author
Forward
0 new messages