On 13 Jul 2010, at 12:44, Matt Spendlove wrote:
> On Mon, Jul 12, 2010 at 6:07 PM, William Ross <[email protected]> wrote:
> On 12 Jul 2010, at 17:53, Matt Spendlove wrote:
> >>
> >> /public/stylesheets/sass/admin/modules
> >> /public/stylesheets/sass/admin/partials
> >> I'm assuming the update task is copying the .svn meta data directories
> >> or something?
>
> The stylesheet and sass update tasks are the only ones that copy whole
> directories so yes, that is where I'd expect invisible files to show up.
> There aren't any .svn directories in radiant's git repository, but perhaps
> your local installation of radiant has SVN metadata in it that conflicts with
> the application you're updating?
>
> I'm using 0.9 frozen into /vendor of the project dir that I'm working on and
> that whole project tree is under svn. The negative impact is that I can't
> commit the updated sass files back to svn once copied from the vendor/radiant
> directory so my cap-deployed version on the server isn't the same, unless I
> run the rake task again on the server. I tried a few things but svn (and
> myself) seemed to be in a bit of a muddle. Im sure I can sort this out but I
> guess from an end user perspective it's a little fussy? It's quite likely
> that folk will have a vendored version of radiant under source control right?
Is your vendored version of radiant held in a repository external to the
application you're working on? That would probably explain the 'switched' flag.
I think you might be stuck, in that case. The update task is a simple file-copy
from one repository to another and works just as well as you'd expect.
We could invent something complicated, but I think your best plan is just to
revert your sass directory and copy across the files you want by hand. Or since
you've vendored radiant, you could just symlink public/stylesheets/sass/admin
to vendor/radiant/public/stylesheets/sass/admin...
By the way, you can run the update task more selectively like this:
rake radiant:update EXCEPT=sass,configs
if you don't want to disturb some other arrangement you've made.
best,
will
