Indeed, you're right. It looks like an artifact of the merging that I
currently have to do to deliver the ON sources. Right now, we have a
separate workspace from ON that I actually do the deliveries from, and I
have to keep it in sync with ON.
For the 26 delivery, usr/src/Targetdirs looks like:
D 1.165 05/09/08 15:23:18 stevel 211 210 00013/00000/01690
MRs:
COMMENTS:
sync with snv_22 and open up crypto code
D 1.164 05/06/12 22:49:52 kupfer 210 208 00000/00000/01690
MRs:
COMMENTS:
Merged changes between child workspace
"/net/tonic-gate/builds/kupfer/tonic-split" and
parent workspace "/net/rankine/export5/kupfer/tonic-clone".
D 1.162.1.1 05/06/11 11:04:52 kupfer 209 207 00000/00000/01670
MRs:
COMMENTS:
Merged changes between child workspace
"/net/tonic-gate/builds/kupfer/tonic-split" and
parent workspace "/net/rankine/export5/kupfer/tonic-clone".
But for the 27 delivery, the history looks like:
D 1.165 05/11/03 09:18:47 stevel 213 212 00000/00013/01705
MRs:
COMMENTS:
Merged changes between child workspace "/builds/stevel/tonic-split.27" and
parent workspace "/builds/stevel/tonic-clone.27".
D 1.164 05/10/31 02:06:48 billm 212 208 00002/00000/01703
MRs:
COMMENTS:
PSARC 2002/240 ZFS
6338653 Integrate ZFS
D 1.163.1.2 05/09/08 15:23:18 stevel 211 210 00013/00000/01690
MRs:
COMMENTS:
sync with snv_22 and open up crypto code
D 1.163.1.1 05/06/12 22:49:52 kupfer 210 208 00000/00000/01690
MRs:
COMMENTS:
Merged changes between child workspace
"/net/tonic-gate/builds/kupfer/tonic-split" and
parent workspace "/net/rankine/export5/kupfer/tonic-clone".
D 1.162.1.1 05/06/11 11:04:52 kupfer 209 207 00000/00000/01670
MRs:
COMMENTS:
Merged changes between child workspace
"/net/tonic-gate/builds/kupfer/tonic-split" and
parent workspace "/net/rankine/export5/kupfer/tonic-clone".
It looks like what *was* 1.165 in the 26 delivery became 1.163.1.2 when
ZFS integrated in as 1.164, since the ON gate is technically only up to
1.164. Our additional OpenSolaris "massages" to make the code buildable
introduces some new revisions that are only in our workspace.
Once Mike Kupfer puts back his split hierarchy all this will change, as
we will be able to pull directly from ON thus saving us a ton of work,
and enabling us to deliver bits more frequently. It will also get rid
of all these merge turds that are in the history :-)
Good eye, and nice catch.
cheers,
steve
Cyril Plisko wrote:
Hi !
While merging 20051116 code drop into SVN repository I noticed
strange thing with file usr/src/Targetdirs. Both code drops contain
the same SCCS revision (1.165) of the file, while their date and content
are different. Is it a sign of some problem in the TW gate or just my
wild imagination ?
$ svn diff svn://svn.genunix.org/opensolaris/tags/20051103/usr/src/Targetdirs
svn://svn.genunix.org/opensolaris/tags/20051116/usr/src/Targetdirs
Index: Targetdirs
===================================================================
--- Targetdirs (.../20051103/usr/src/Targetdirs) (revision 40)
+++ Targetdirs (.../20051116/usr/src/Targetdirs) (revision 40)
@@ -22,7 +22,7 @@
#
# CDDL HEADER END
#
-# ident "@(#)Targetdirs 1.165 05/09/08 SMI"
+# ident "@(#)Targetdirs 1.165 05/11/03 SMI"
#
# The list is built of owner-group combinations. ROOT.SYS occurs twice
# because some directories owned by root and in group sys are subdirectories
@@ -81,6 +81,7 @@
/etc/dfs \
/etc/fs \
/etc/fs/nfs \
+ /etc/fs/zfs \
/etc/ftpd \
/etc/rpcsec \
/etc/security \
@@ -307,6 +308,7 @@
/usr/lib/fs \
/usr/lib/fs/nfs \
/usr/lib/fs/proc \
+ /usr/lib/fs/zfs \
/usr/lib/mdb \
/usr/lib/mdb/kvm \
/usr/lib/mdb/proc \
_______________________________________________
opensolaris-code mailing list
[email protected]
https://opensolaris.org:444/mailman/listinfo/opensolaris-code
--
stephen lau // [EMAIL PROTECTED] | 650.786.0845 | http://whacked.net
opensolaris // solaris kernel development
_______________________________________________
opensolaris-code mailing list
[email protected]
https://opensolaris.org:444/mailman/listinfo/opensolaris-code
