Mike Kupfer wrote:
"Roland" == Roland Mainz <[EMAIL PROTECTED]> writes:
Roland> ... BTW: I guess some of the follow-ups of the ksh93-integration
Roland> project will still be Subversion based since they may use
Roland> branches from that tree (e.g. shcomp/shbinexec&co.) ...
I think you'll find it easier to synchronize with onnv-gate if you
convert to Mercurial. It's pretty easy to convert:
athyra$ mkdir proto5
athyra$ cd proto5
athyra$ svn co
http://svn.genunix.org/repos/on/branches/ksh93/gisburn/prototype005/usr
A usr/src
A usr/src/OPENSOLARIS.LICENSE
[...]
athyra$ cd ..
athyra$ mkdir proto5-hg
athyra$ (cd proto5; tar cf - .) | (cd proto5-hg; tar xf -)
athyra$ find proto5-hg -name .svn -print > /tmp/rm-me
athyra$ rm -rf `cat /tmp/rm-me`
athyra$ cd proto5-hg
athyra$ hg init
athyra$ hg addremove
adding usr/src/Makefile.lint
adding usr/src/OPENSOLARIS.LICENSE
[...]
athyra$ ls -a
./ ../ .hg/ usr/
athyra$ hg stat
A usr/src/Makefile.lint
A usr/src/OPENSOLARIS.LICENSE
[...]
athyra$ hg commit
[type commit message in editor window that pops up]
athyra$ hg stat
athyra$
(On the other hand, I don't have much Subversion experience, so maybe
resynchronizing in Subversion is easier than I think...?)
That would leave him with a tree that while containing ON, is entirely
disconnected from the hg onnv-gate, it'd make more sense to clone the gate a
suitable point (onnv_*), and apply his changes on top just as he is with svn
, then actually use the SCM for future merges, or, as he's doing now, clone
the gate again further ahead, and re-apply by hand.
Anyway, the important bit here isn't workflow, it's "The above is going to
give him a divergent gate with identical contents", rather than a descended
gate.
-- Rich
_______________________________________________
opensolaris-code mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/opensolaris-code
