Menu

#54 RCS lock problem: change cannot integrate

open
nobody
None
5
2014-08-20
2007-09-06
Anonymous
No

Hi All,

We got an RCS error during an integration, which has us puzzled.

The point where the failure is reported is listed below, where RCS ci reports
"no lock set by acao". (acao is the login name of Andrew Cao, the developer.)

When the integration is retried (aeibu, then start integration again from a
new aeib), the failure is repeated. It looks like this change can't be
integrated. It seems that RCS should have a lock on all of the files in the
change, and does not have one on this particular file, and cannot make one.

There is a work-around (aeclone the change, re-pass the review, integrate the
cloned change), which allows us to keep working, but we still have this change
which can't be integrated.

Can anyone shed light on this problem, please?

We are running aegis and Linux version:

$ aegis --version
aegis version 4.22.D005
$ uname -a
Linux dozer 2.4.28-gentoo-r9 #4 SMP Thu Dec 28 07:50:47 EST 2006 i686 Intel(R) Xeon(TM) CPU 2.80GHz GenuineIntel GNU/Linux
$

--
Cheers,
Ben Morphett (ben.morphett@silverbrookresearch.com)

$ aeipass -c 28
...
aegis: ( rlog -r /usr/local/home/aegis/oss/history/ad.uui/3d.uui/219cfa44.42a/
aadc4c97.e93/695dfe,v | awk '/^head:/ {print $2}' ) >
/tmp/aegis-4df4fa84-6c88-4050-86cc-eba9ede71c60
aegis: ci -f -u -d -M -m28 -t/dev/null /tmp/aegis-4481c0e7-b994-4d47-927b-
2c5f0cf6e4ec/91d90a /usr/local/home/aegis/oss/history/5a.uui/f2.uui/
0535632a.41b/eaaafe41.88e/91d90a,v; rcs -U
/usr/local/home/aegis/oss/history/5a.uui/f2.uui/0535632a.41b/eaaafe41.
88e/91d90a,v
/usr/local/home/aegis/oss/history/5a.uui/f2.uui/0535632a.41b/eaaafe41.88e/91d90a
,v <-- /tmp/aegis-4481c0e7-b994-4d47-927b-2c5f0cf6e4ec/91d90a
initial revision: 1.1
done
RCS file: /usr/local/home/aegis/oss/history/5a.uui/f2.uui/0535632a.41b/eaaafe41.
88e/91d90a,v
done
aegis: ( rlog -r /usr/local/home/aegis/oss/history/5a.uui/f2.uui/0535632a.41b/
eaaafe41.88e/91d90a,v | awk '/^head:/ {print $2}' ) >
/tmp/aegis-12862e19-cd55-4f12-91a2-2ae5615bebfb
aegis: ci -f -u -d -M -m28 /tmp/aegis-e27ef745-10e4-40da-b822-114c7fc8469e/
f06458 /usr/local/home/aegis/oss/history/91.uui/9c.uui/a2baa193.4ad/
fb46c391.22c/f06458,v
/usr/local/home/aegis/oss/history/91.uui/9c.uui/a2baa193.4ad/fb46c391.22c/f06458
,v <-- /tmp/aegis-e27ef745-10e4-40da-b822-114c7fc8469e/f06458
ci: /usr/local/home/aegis/oss/history/91.uui/9c.uui/a2baa193.4ad/fb46c391.22c/f0
6458,v: no lock set by acao
aegis: command "ci -f -u -d -M -m28 /tmp/aegis-e2..." exit status 1
$
$ ls -l /usr/local/home/aegis/oss/history/91.uui/9c.uui/a2baa193.4ad/fb46c391.22c/f06458,v
-r--r--r-- 1 aegis aegis 733 Aug 29 11:49 /usr/local/home/aegis/oss/history/91.uui/9c.uui/a2baa193.4ad/fb46c391.22c/f06458,v
$

Discussion

  • High Performance Coder

    Logged In: YES
    user_id=1509346
    Originator: NO

    I've come across this problem quite frequently, and have finally figured out a solution.

    You can try to unlock the offending file (as the file owner) using

    rcs -u /usr/local/home/aegis/oss/history/91.uui/9c.uui/a2baa193.4ad/fb46c391.22c/f06458,v

    In the event that this doesn't work, you can also just delete the file (it will be rebuilt, with some history information missing).

    'find' is a useful command for applying a command to all *,v files:

    find /usr/local/home/aegis/oss -name "*,v" -exec rcs -u {} \;

     
  • R A Smith

    R A Smith - 2008-01-23

    Logged In: YES
    user_id=1734254
    Originator: NO

    The history_create_command for a project using RCS should include "rcs -U ${quote $history,v}" (note the upper case U), which should prevent this. Does "rlog file,v" indicate that locks are strict for some of your history files? If so, applying "rcs -U" to them as the project user may help. If not, and if files are owned by the project user id, there may be a bug in your version of RCS.

     
  • High Performance Coder

    Logged In: YES
    user_id=1509346
    Originator: NO

    I have had the rcs -U ${quote $history,v} in the config file since day dot, but this didn't prevent the lock issue from rearing its head.

    The RCS may be buggy. I'm using 5.7 on Slackware.

     

Log in to post a comment.