On 07/06/2010 08:45 PM, Ken Sharp wrote:
Works fine here, but I've changed the encoding of the patch to see if that helps.
Hi Ken,
This one is even worse:
../../../wine-git/dlls/mapi32/Ga.rc:32:87: Error: Invalid character in string 'R-phost a sheoladh mar a theip n� g� duit a cliant r�omhphoist MAPI shuite�il.' for codepage 65001 make[1]: *** [Ga.res] Error 1 make[1]: Leaving directory `/wine/wine64/dlls/mapi32' make: *** [dlls/mapi32] Error 2
You've changed the encoding of the file but left in the pragma.
The problem with applying was not with Ga.rc but with the changes to Makefile.in
On 07/06/2010 11:36 PM, Ken Sharp wrote:
Did you test it with a fresh branch? You don't even need a named branch for that; one with the detached HEAD works as well for the test: - git checkout origin/master - git am $email
I'm not sure how you follow the upstream git: git pull --rebase or plain git pull which uses merges. I'm pretty sure the git merge will manage to resolve the conflict in Makefile.in automatically. That could be the explanation why it works for you.
bye michael
On 07/06/2010 11:51 PM, Michael Stefaniuc wrote:
I'm not an expert but here is what I do in these cases: git reset --hard origin #remove any change git status #to see if you have a clean directory, if not rm or mv all you want git pull #update git apply /path/to/your.patch
You should also have a look at http://wiki.winehq.org/GitWine (^D it, very useful)
On 7/7/2010 10:34 AM, GOUJON Alexandre wrote:
I usually just use git fetch ; git rebase origin Followed by patch -p1 < foo.patch
Never had any problems until recently.
GOUJON Alexandre wrote:
The first two steps are dangerous as you can loose work with them. If you want a pristine git tree just create a throw away one; it is faster: git clone --reference=$path_to_your_normal_wine_git_dir git://source.winehq.org/git/wine.git wine-upstream-test The --reference will make sure to reuse the object files in your normal Wine git tree. That's what I use for regression hunts as it allows me to have multiple regressions going on at the same time.
git apply /path/to/your.patch
git am is better for this type of test as it tests more than just if the diff applies. And it automatically deals with the encoding of the patch in the email if you are trying to reproduce why the patch you submitted didn't apply for Alexandre.
You should also have a look at http://wiki.winehq.org/GitWine (^D it, very useful)
Yes, but a little "outdated". The stuff described there still works but the git porcelain learned new stuff that improved some work flow a lot. E.g. "git rebase -i" and "git add -p" are very useful commands.
bye michael
-
GOUJON Alexandre -
Ken Sharp -
Michael Stefaniuc -
Paul Vriens