CVS lock ?
Vladimir Dergachev
volodya at mindspring.com
Thu Dec 16 05:11:38 PST 2004
On Thu, 16 Dec 2004, Daniel Stone wrote:
> On Thu, 2004-12-16 at 08:05 -0500, Vladimir Dergachev wrote:
>> On Thu, 16 Dec 2004, Daniel Stone wrote:
>>> Permissions problem, which I've just fixed.
>>
>> I still can't commit, CVS returns the same message as before:
>>
>> volodya at silver:/nfs/node2-storage/Trees/xf86/X.org/xc/programs/Xserver/hw/xfree86/drivers/ati$
>> cvs -z3 commit ../../../../../../ChangeLog radeon_accel.c
>> cvs commit: warning: commitinfo line contains no format strings:
>> "/cvs/xorg/CVSROOT/commitcheck"
>> Appending defaults (" %r/%p %s"), but please be aware that this usage is
>> deprecated.
>> cvs commit: Up-to-date check failed for `radeon_accel.c'
> ^^^^^^^^^^^^^^^^^^^^^^^
>> cvs [commit aborted]: correct above errors first!
>> cvs commit: saving log message in /tmp/cvsbXDRfw
>
> This means that someone else has modified radeon_accel.c, so you need to
> do a cvs up before you commit.
>
Yet, when I do cvs -z3 update radeon_accel.c I get nothing:
volodya at silver:/nfs/node2-storage/Trees/xf86/X.org/xc/programs/Xserver/hw/xfree86/drivers/ati$
cvs -z3 update radeon_accel.c
M radeon_accel.c
And the output of cvs -z3 status radeon_accel.c confirms I have an
up to date version:
volodya at silver:/nfs/node2-storage/Trees/xf86/X.org/xc/programs/Xserver/hw/xfree86/drivers/ati$
cvs -z3 status radeon_accel.c
===================================================================
File: radeon_accel.c Status: Locally Modified
Working revision: 1.13
Repository revision: 1.13
/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Thank you !
Vladimir Dergachev
More information about the xorg
mailing list