You Cannot have code collaboration directly with Opensolaris Builds. What you need to do is Diff the Project with respect to your source tree and Set up diff for you project for b77 and later. This will help in integration of the files when they get merged with the main branch.
Sujit K M -----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Thomas Lecomte Sent: Wednesday, December 05, 2007 1:33 PM To: [email protected] Subject: [storage-discuss] Best practices -- technical recommandations Hi guys, As you may have noticed, the Squashfs project I proposed some weeks ago have been approved, and I'm about to start working on it. Of course, as we currently work on our own (obviously we aren't integrated in the ON codebase), I have setup an SVN repository on OpenSolaris.org. I'm wondering what's the best way to "integrate" my work to the OpenSolaris code tree. Currently, here's how I was planning to do. I have a "squashfs" repository, with the following files. pcdev198>pwd ; echo -- ; find . -type f -print | grep -v svn /export/space/squashfs -- ./usr/src/uts/common/fs/squashfs/squashfs_vfsops.c ./usr/src/uts/common/fs/squashfs/squashfs_vnops.c ./usr/src/uts/common/Makefile.files ./usr/src/uts/common/Makefile.rules ./usr/src/uts/intel/squashfs/Makefile ./usr/src/uts/intel/Makefile.intel.shared ./usr/src/uts/sparc/squashfs/Makefile ./usr/src/uts/sparc/Makefile.sparc.shared ./populate.sh ./squashfs_files The "populate.sh" file populates my modified files to an ON source tree. Files are listed in "squashfs_files". Example: pcdev198>./populate.sh ./populate.sh: usage: ./populate.sh [-f] [path-to-ON-sources] Options: -f -- Do not ask confirmation when overwriting files. pcdev198>./populate.sh -f /export/space/os-build ./populate.sh: backuping /export/space/os-build/usr/src/uts/common/fs/ squashfs/squashfs_vfsops.c ./populate.sh: populating usr/src/uts/common/fs/squashfs/ squashfs_vfsops.c ./populate.sh: backuping /export/space/os-build/usr/src/uts/common/fs/ squashfs/squashfs_vnops.c ./populate.sh: populating usr/src/uts/common/fs/squashfs/ squashfs_vnops.c ./populate.sh: backuping /export/space/os-build/usr/src/uts/common/ Makefile.files ./populate.sh: populating usr/src/uts/common/Makefile.files ./populate.sh: backuping /export/space/os-build/usr/src/uts/common/ Makefile.rules ./populate.sh: populating usr/src/uts/common/Makefile.rules ./populate.sh: backuping /export/space/os-build/usr/src/uts/intel/ squashfs/Makefile ./populate.sh: populating usr/src/uts/intel/squashfs/Makefile ./populate.sh: backuping /export/space/os-build/usr/src/uts/intel/ Makefile.intel.shared ./populate.sh: populating usr/src/uts/intel/Makefile.intel.shared ./populate.sh: backuping /export/space/os-build/usr/src/uts/sparc/ squashfs/Makefile ./populate.sh: populating usr/src/uts/sparc/squashfs/Makefile ./populate.sh: backuping /export/space/os-build/usr/src/uts/sparc/ Makefile.sparc.shared ./populate.sh: populating usr/src/uts/sparc/Makefile.sparc.shared ./populate.sh: Populating done. pcdev198> The problem is that my own file which will overwrite ON's ones will have to be in sync with the latest build ASAP. Currently, i'm working on b77, but it means that i'll have to stay as much up-to-date as possible. Maybe you've better solutions on how to work with this type of project/problem? Any idea or comment are welcome! :-) Next, I'd like to know if there's any documentation about how to use SCCS in conjunction with my sources. The Developer's Reference states that "All files must be under SCCS control, and each must have a set of keywords near the top [...]." OK, but a small documentation explaining the goal/role/purpose of SCCS, and how to efficiently use it, would be welcomed ;-) Thanks to everyone who took the time to read me! -- Thomas Lecomte _______________________________________________ storage-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/storage-discuss _______________________________________________ storage-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/storage-discuss
