[Building Sakai] SVN override sub directory in externals

Bryan Holladay holladay at longsight.com
Mon Feb 20 11:18:27 PST 2012


Yea, SVN can't do everything I guess (that's what GIT is for).  I
found an acceptable solution:

I just pointed to each tool separately in my .externals and
(unfortunately) I couldn't point to the files is /osp, so I just svn
copied them into my branch.  (see
http://subversion.apache.org/docs/release-notes/1.6.html#file-externals)

Seems to work and isn't too terrible.

Thanks!

On Mon, Feb 20, 2012 at 2:09 PM, Matthew Jones <matthew at longsight.com> wrote:
> Yea, I can't think of any way at the moment to hack around this if you still
> want it to work directly with the 'svn co' command. This was how cafe was
> originally checked out (individual subdirectories) and it would work for osp
> if you didn't need the files in the root directory.
>
> If you can require that everyone using this repository also uses a special
> svn override function or a wrapper script then you can work around it.
> Nothing in the current released versions that I can find though.
>
> I continually keep adding features as I see them to my 'local' svn function
> to fix things that aren't in the code yet. ;) (Like the option to make
> ignore-externals the default)
>
> If you *wanted* you could *probably* also:
> check out osp and then this portal to a separate folder
> osp https://source.sakaiproject.org/svn/osp/branches/sakai-2.8.x/
> osp/longsight-portal https://source.sakaiproject.org/svn/msub/longsight.com/osp/sakai-2.8.x/portal-2.8.x_features-backport/
>
> Then you could replace the <modules>portal</modules> in the osp pom with
> longsight-portal, if pom modifications are easier/possible. :)
>
> None of these are completely automatic though :( If only SVN had pre and
> post externals hooks!
>
> On Mon, Feb 20, 2012 at 1:50 PM, Bryan Holladay <holladay at longsight.com>
> wrote:
>>
>> Seth,
>>
>> I tried force and that gave me the same error:
>>
>> svn co --force
>> https://source.sakaiproject.org/svn/msub/longsight.com/custom_builds/60/distros/2.8.x
>> 60_distros_2.8.x
>>
>> Fetching external item into '60_distros_2.8.x/osp/portal'
>> svn: warning: '60_distros_2.8.x/osp/portal' is already a working copy
>> for a different URL
>>
>>
>> Matt,
>>
>> I was hoping to avoid having to name each tool in OSP, not to mention
>> that there is a pom file and other items in sakai/osp.  But its
>> looking that that's the only way.  At least the tools won't have to be
>> branched (just the osp/pom.xml and other files).
>>
>>
>> Thanks,
>> Bryan
>>
>>
>> On Mon, Feb 20, 2012 at 1:33 PM, Matthew Jones <matthew at longsight.com>
>> wrote:
>> > I don't think externals allows you to do that directly. It would have to
>> > realize what you want to do is an svn switch.
>> >
>> > It also sounds like it would be great if svn externals supported a depth
>> > or
>> > no recursion, but that looks like an unfulfilled feature. :(
>> > http://subversion.tigris.org/issues/show_bug.cgi?id=3216
>> >
>> > You could probably branch the top level of osp and create an externals
>> > there
>> > with each individual
>> > subdirectory.
>> >
>> >
>> > common https://source.sakaiproject.org/svn/osp/branches/sakai-2.8.x/common
>> > docs  https://source.sakaiproject.org/svn/osp/branches/sakai-2.8.x/docs
>> >
>> > glossary  https://source.sakaiproject.org/svn/osp/branches/sakai-2.8.x/glossary
>> > . . .
>> >
>> > portal https://source.sakaiproject.org/svn/msub/longsight.com/osp/sakai-2.8.x/portal-2.8.x_features-backport/
>> >
>> > Then include that directory in your externals? :)
>> >
>> > One time in an old build process at Michigan, I had a perl wrapper for
>> > SVN
>> > had a special case where if the directory was specified again it would
>> > perform a switch. Seemed like a good idea. :(
>> >
>> > -Matthew
>> >
>> > On Mon, Feb 20, 2012 at 1:00 PM, Bryan Holladay <holladay at longsight.com>
>> > wrote:
>> >>
>> >> Does anyone know how to override a sub directory in SVN's .externals?
>> >> My example is trying to override an OSP tool but keep the rest of the
>> >> OSP tools the same:
>> >>
>> >> .externals:
>> >>
>> >> osp https://source.sakaiproject.org/svn/osp/branches/sakai-2.8.x/
>> >> osp/portal
>> >>
>> >> https://source.sakaiproject.org/svn/msub/longsight.com/osp/sakai-2.8.x/portal-2.8.x_features-backport/
>> >>
>> >>
>> >> SVN CO doesn't work and I get this error:
>> >>
>> >> Fetching external item into '60_distros_2.8.x/osp/portal'
>> >> svn: warning: '60_distros_2.8.x/osp/portal' is already a working copy
>> >> for a different URL
>> >>
>> >>
>> >> SVN UP works and replaces it correctly.
>> >>
>> >>
>> >> Thanks,
>> >> Bryan
>> >> _______________________________________________
>> >> sakai-dev mailing list
>> >> sakai-dev at collab.sakaiproject.org
>> >> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>> >>
>> >> TO UNSUBSCRIBE: send email to
>> >> sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of
>> >> "unsubscribe"
>> >
>> >
>
>


More information about the sakai-dev mailing list