Fwd: [GitHub] paltman sent you a message

[Michael Trier]

---------- Forwarded message ----------
From: GitHub <nor...@github.com>
Date: Thu, Mar 19, 2009 at 4:29 PM
Subject: [GitHub] paltman sent you a message
To: mtr...@gmail.com




paltman wants you to pull from paltman/django-extensions at master

Body: Hey All:

Not sure if the official repo for this is now Jannis's here on GitHub, or still over on Google Code, but they both look like they are in sync with each other.

I add optional an parameter (--dir) to sync_media_s3, that I thought might be useful to other.  Pull my patch and check it out.  I love this command extension, but didn't want it to sync my entire media folder, only some of it (actually the output from django-compress, which generated into another folder that I had specified).

Thanks,
Patrick

View repository: http://github.com/paltman/django-extensions/tree/master

--
Michael Trier
http://blog.michaeltrier.com/
http://thisweekindjango.com/

[trbs]

Is Patrick on the mailinglist ?

Cause i see a:

- key.make_public()
+ key.set_acl('public-read')

Diff in his changeset for which I'm wondering what that means....

-bas

[Michael Trier]

I don't know but I will ask him to join if he's not.

Michael

[Patrick Altman]

Yes, I am on the mailing list.

I made that change because make_public() didn't seem to be working and while I am a committer (very infrequent) on the boto project, I didn't have time to look into it and fix it.

make_public() certainly is/seems like the right interface to use, but it didn't seem to be working (which is a problem to resolve in boto -- but nonetheless it's not working yet).

On Wed, Apr 1, 2009 at 6:07 AM, trbs <v.oos...@gmail.com> wrote:

--
Patrick Altman
http://paltman.com

[Bas van Oostveen]

I'm trying to merge in your patch of sync_media_s3 but i get a lot of
conflicts on files that should not be in conflict.

Watching github your repository is a fork of
http://github.com/nowells/django-extensions/tree/master but that page
doesn't seem to be working on github. ("There was a problem serving the
requested page.")

So I'm wondering is your django-extensions tree a fork of the main
django-extensions ? if not could you please make a patch for it or fork
from the main tree so i can pull from that.

Thanks!
Bas

[Jannis Leidel]

Am 07.04.2009 um 13:19 schrieb Bas van Oostveen:

> I'm trying to merge in your patch of sync_media_s3 but i get a lot of
> conflicts on files that should not be in conflict.
>
> Watching github your repository is a fork of
> http://github.com/nowells/django-extensions/tree/master but that page
> doesn't seem to be working on github. ("There was a problem serving
> the
> requested page.")

I'm pretty sure that's because Patrick originally forked from my
mirror which had different commit ids (due to the way I created the
mirror -- without svn authors file). That won't allow to merge easily
and may need manual patch creation and re-applying.

> So I'm wondering is your django-extensions tree a fork of the main
> django-extensions ? if not could you please make a patch for it or
> fork
> from the main tree so i can pull from that.

If you don't mind I could do that like I moved over Rob Hudson's
changes to my manytomany widget branch. Let me know..

Jannis

[Patrick Altman]

I thought that was the main repo. Where should I be forked from?

---
Patrick Altman
(615) 300-2930

[Sent from my iPhone]

[Jannis Leidel]

Am 07.04.2009 um 13:19 schrieb Bas van Oostveen:

>

> I'm trying to merge in your patch of sync_media_s3 but i get a lot of
> conflicts on files that should not be in conflict.
>
> Watching github your repository is a fork of
> http://github.com/nowells/django-extensions/tree/master but that page
> doesn't seem to be working on github. ("There was a problem serving
> the
> requested page.")
>
> So I'm wondering is your django-extensions tree a fork of the main
> django-extensions ? if not could you please make a patch for it or
> fork
> from the main tree so i can pull from that.
>
> Thanks!
> Bas

I just merged it with master:

http://github.com/django-extensions/django-extensions/commit/4bf682a56aefac6e77dcbfc5f3c5438524fdbfe3

[Jannis Leidel]

Am 07.04.2009 um 14:43 schrieb Patrick Altman:

>
> I thought that was the main repo. Where should I be forked from?

It wasn't the main repo at the time I created the mirror. But now it
is: http://github.com/django-extensions/django-extensions/

Please fork from there again. Your current fork isn't commit id
compatible with the old mirror.

Jannis

[Patrick Altman]

Has anyone talked with the author of django-compress about including
it in the django-extensions project?

I am using both wrapped up in a script to compress and deploy media
via sync_s3 and it just dawned on me that compress would be an
excellent addition to the extensions project.

---
Patrick Altman
(615) 300-2930

[Sent from my iPhone]