=================== BUG #589: LATEST MODIFICATIONS ================== http://savannah.gnu.org/bugs/?func=detailbug&bug_id=589&group_id=11
Changes by: Yann Dirson <[EMAIL PROTECTED]> Date: 2002-Jun-14 15:34 (Europe/Paris) ------------------ Additional Follow-up Comments ---------------------------- I downloaded the nightly tarball (http://savannah.gnu.org/cvs.backups/alcovebook.tar.gz), re-added the MERGE-POINT_1-0_2 tag manually (cvs rtag -r BRANCH_1-0 MERGE-POINT_1-0_2 sgml2x) and requested the merge with the same command using CVSROOT on local filesystem, and it went OK, as I had expected. Then I set CVSROOT to access to the same repository using ssh, and got the exact same behaviour. Reproduced with all 4 combinations of (client,server)*(1.10.7,1.11p1). Looks like a nasty CVS bug... =================== BUG #589: FULL BUG SNAPSHOT =================== Submitted by: ydirson Project: Savannah Submitted on: 2002-Jun-12 17:21 Category: CVS Severity: 5 - Average Priority: None Bug Group: None Resolution: None Assigned to: villate Status: Open Effort: 0.00 Summary: Cannot merge branches Original Submission: I want to merge a branch into trunk for sgml2x module in alcovebook, but CVS appears to have problems on server side. Looks like it extracts a version of Makefile to temporary storage, and is not able to access it. Would you by (mal)chance be using reiserfs on the CVS server ? $ cvs -tn upd -dP -j MERGE-POINT_1-0_2 -> main loop with [EMAIL PROTECTED] -> Starting server: ssh subversions.gnu.org -l ydirson cvs server ? tmp S-> unlink_file(CVS/Entries.Static) S-> unlink_file(./CVS/Entries.Static) cvs server: Updating . S-> join_file(.cvsignore, 1.2, MERGE-POINT_1-0_2, ) RCS file: /cvsroot/alcovebook/sgml2x/Makefile,v retrieving revision 1.14 S-> join_file(Makefile, 1.14, MERGE-POINT_1-0_2, ) S-> checkout (/cvsroot/alcovebook/sgml2x/Makefile,v, 1.14, , Makefile) S-> unlink_file(.#Makefile.1.14) S-> copy(Makefile,.#Makefile.1.14) S-> checkout (/cvsroot/alcovebook/sgml2x/Makefile,v, 1.14, , /tmp/cvs474hIV) retrieving revision 1.14.2.3 S-> checkout (/cvsroot/alcovebook/sgml2x/Makefile,v, 1.14.2.3, , /tmp/cvsC08GbH) Merging differences between 1.14 and 1.14.2.3 into Makefile cvs server: Makefile: No such file or directory Follow-up Comments ******************* ------------------------------------------------------- Date: 2002-Jun-14 15:34 By: ydirson I downloaded the nightly tarball (http://savannah.gnu.org/cvs.backups/alcovebook.tar.gz), re-added the MERGE-POINT_1-0_2 tag manually (cvs rtag -r BRANCH_1-0 MERGE-POINT_1-0_2 sgml2x) and requested the merge with the same command using CVSROOT on local filesystem, and it went OK, as I had expected. Then I set CVSROOT to access to the same repository using ssh, and got the exact same behaviour. Reproduced with all 4 combinations of (client,server)*(1.10.7,1.11p1). Looks like a nasty CVS bug... ------------------------------------------------------- Date: 2002-Jun-12 17:27 By: yeupou As you can see http://savannah.gnu.org/phpsysinfo/ we only use ext2 No files currently attached For detailed info, follow this link: http://savannah.gnu.org/bugs/?func=detailbug&bug_id=589&group_id=11
