Follow-up Comment #2, sr #110531 (project administration):
That would indeed be the procedure I took. After fixing the merge conflict,
still failing:
$ cat CVS/Root
:ext:che...@cvs.savannah.gnu.org:/web/gnats
$ cvs update
cvs update: Updating .
RCS file: /web/gnats/gnats/gnats.html,v
retrieving revision 1.55
retrieving revision 1.56
Merging differences between 1.55 and 1.56 into gnats.html
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in gnats.html
C gnats.html
...
$ cvs ci -m 'Adapting new server includes and simplifying' gnats.html
/web/gnats/gnats/gnats.html,v <-- gnats.html
new revision: 1.57; previous revision: 1.56
cvs [commit aborted]: could not open lock file
`/web/gnats/gnats/,gnats.html,': Permission denied
_______________________________________________________
Reply to this item at:
<https://savannah.nongnu.org/support/?110531>
_______________________________________________
Message sent via Savannah
https://savannah.nongnu.org/
