----- Original Message ----- From: "Scott Michel" <[EMAIL PROTECTED]> To: <[email protected]> Sent: Monday, June 06, 2005 6:02 PM Subject: [darcs-users] Anything similar to CVS module file's "&" inclusion
> I'm converting over my CVS repo(s) to use darcs. What I had done in CVS > is broken up my source code, so that the "core" code would be pulled in > by the additional modules. Each module is separate from the others. The > simplified example: > > src-core -d src src-core > jni-src -d jni &src-core jni-src > py-src -d python &src-core py-src > > The "&src-core" instructs CVS to pull the src-core module, which ends up > creating a jni/src subdirectory with all of src-core's files underneath it. > > Any suggestions on how to emulate this functionality in darcs? > I have one, but it may not be very pertinent. I thought of this: mkdir a mkdir b cd a/ darcs init mkdir a touch a/1 a/2 a/3 darcs add -r a/ darcs record -a -m "a1" cd ../b/ darcs init mkdir b touch b/1 b/2 b/3 darcs add -r b/ darcs record -a -m "b1" then cd ../ mkdir c cd c/ darcs init darcs pull ../a/ darcs pull ../b/ then cd ../ mkdir d cd d/ darcs init darcs pull ../c a and b never conflict. a and b nest inside c. That's also at the bottom of http://www.darcs.net/DarcsWiki/NestedRepositories This needs a lot of explanation. a and b are like src-core and jni-src or py-src. a and b are merged together in c. c is therefore the repository which would get if you wanted a merged a and b. Or if you wish you can pull a and b separately. I would like this more if we had *patch rebasing*. For example: darcs pull --base=a/ ../a/ which would pull patches from ../a/ and apply them to the current repository as if those patches have been recorded in the a/ directory. _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
