Comment #11 on issue 3426 by [email protected]: "Didn't apply patch
cleanly"
http://code.google.com/p/reviewboard/issues/detail?id=3426
Finally fixed the problem. It seems the repo in the server was a few
commits ahead. I had to pull the repo fresh, use my first patch to get the
file in there (and then generate a parent patch). Then I used my second
patch (the one that wouldn't upload), which ended up not applying, even
though the .rej file just had a few comment differences. I fixed that,
generated a new diff, then uploaded that and the parent--after which
everything worked ok.
I really hope I don't have to go through this process every time the
server-side repo gets a few commits ahead of my local one--but then again,
I suck at git, and might be doing something completely wrong.
--
You received this message because this project is configured to send all
issue notifications to this address.
You may adjust your notification preferences at:
https://code.google.com/hosting/settings
--
You received this message because you are subscribed to the Google Groups
"reviewboard-issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/reviewboard-issues.
For more options, visit https://groups.google.com/d/optout.
