[Bug 42657] ACDSee Pro 9 needs msvcr120.dll.?Alloc at Concurrency@@YAPEAX_K at Z

[wine-bugs at winehq.org]

https://bugs.winehq.org/show_bug.cgi?id=42657

--- Comment #18 from Matteo Bruni <matteo.mystral at gmail.com> ---
Sorry for the spam...

(In reply to Gijs Vermeulen from comment #14)
> (In reply to C0rn3j from comment #13)
> > On another note, how would I apply a new patch  to my cloned git repo? It
> > seems to screw up everything, I've no idea how to start with a clean slate
> > except for wiping everything and redownloading it again

That seems suboptimal :)
You can take a look at https://wiki.winehq.org/Git_Wine_Tutorial although that
probably doesn't quite cover your needs. It depends on how you want to manage
your git tree but e.g. you could do inside your git working directory:

git reset --hard origin/master  #restore your working directory to upstream,
discard all local changes
git pull  #update your git tree with new commits from upstream

> Copy the patch to your repo root. Then run "patch -p1 < nameofpatch.patch".
> And if you want to revert the patch run "patch -R -p1 < nameofpatch.patch".

You never want to use plain patch in a git tree. If the patch is in the mbox
format (which is the case e.g. for the patches on
https://source.winehq.org/patches/) you probably want to do "git am
filename.patch". Otherwise just "git apply filename.patch".

-- 
Do not reply to this email, post in Bugzilla using the
above URL to reply.
You are receiving this mail because:
You are watching all bug changes.