On 11-09-23 09:51 AM, Ashar Voultoiz wrote:
On 23/09/11 10:39, Max Semenik wrote:
<snip> > Another thing: I currently use SVN's trick with embedded checkouts where the > content of /extensions in a trunk/phase3 checkout is replaced with a > checkout of trunk/extensions. This way, extensions are located at the > canonical path relative to core and I'm able to commit into phase3 and > extensions at the same time. > > Does Git support anything like that? MW_INSTALL_PATH is not really > convenient when you have to use trunk and several branches at the same time. Maybe with git submodules ? The /trunk/extensions could be set to have all extensions git repositories as submodules.
We still need to find out how we will organize the git repositories though.
Git submodules are tied to specific commit id's, so I wouldn't really use it.
But you can put a git repo inside a directory that's part of another git repo perfectly fine even without submodules (though without an ignore it might try to /helpfully/ provide it as an option to add as a submobule within the gui while committing). We will probably include a .gitignore into gore that will let us have /extensions/README but ignore all other things inside /extensions/, same thing for our other dynamic folders like /images/. So you shouldn't have to worry about something like that.
Does svn actually update disconnected svn directories that just happen to be in a subdirectory? If it does do that then I do admit we might want to provide a handy script to batch upgrade... well, actually extension wise I've been thinking of that for extensions for awhile. ---- Oh... wait, are you talking about a root commit where you make one commit that spans phase3 and extensions? No, I can almost assure you that core and extensions are going to be in separate repos so commits will need to be made separately to them (though we may want to include helpers to make it easier to do a commit to multiple extensions en-masse).
~Daniel Friesen (Dantman, Nadir-Seen-Fire) [http://daniel.friesen.name]