On Tue, 2010-06-01 at 17:30 -0400, Jason Guiditta wrote:
> On Wed, 2010-05-26 at 11:55 -0400, Tomas Sedovic wrote:
> > Howdy,
> >
> > These two patches delete all the JavaScript code, libraries, layouts
> > and views that are not used anymore.
> >
> > Since the minified JS files have lines that are too long for poor
> > git-send-email to handle, the patches are in this e-mail's attachment.
> >
> > Thomas
> > _______________________________________________ deltacloud-devel
> > mailing list deltacloud-devel(a)lists.fedorahosted.org
> >
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
>
> 0001 - ACK
> 0002 - NACK, this does not apply against current next. Please rebase
> and I will retest tomorrow.
>
> -j
>
Hey Jason, thanks for the notice. This is a tricky one, though -- the
issue is not one of rebasing.
When I rebase the branch against the current next, run git-format-patch
and then try git-am, it still fails.
One of the files to be deleted (src/public/javascripts/jquery.form.js)
is in the repo with CRLF line endings -- probably has been from the
start. And git is having issues with that.
The best what I could come up with is this:
1. Switch to the branch where you want to apply the patch
2. Run:
$ git config core.autocrlf true
$ git config core.safecrlf false
3. Do git-am as usual
I've just tried that with the fresh next and it worked.
There is still a bunch of files (since the initial commit it seems) that
have these sorts of issues -- CRLF, trailing whitespace and all that.
Later on, I will send a patch to fix them once for all. After that, the
git hooks already in place combined with the line-ending config above
should protect us from these kids of problems in the future.
Thomas
Using what you suggest above, this applies fine, so ACK. Hopefully this
will not be an issue when you try to push it to fedorahosted, but we'll
see soon enough, I guess.
-j