[CRIU] [PATCH 2/4] p.haul: merge commits from https://github.com/ThomasJClark/criu-gui-demo

Pavel Emelyanov xemul at parallels.com
Wed Oct 21 05:47:26 PDT 2015


On 10/20/2015 06:20 PM, Adrian Reber wrote:
> From: Tom Clark <tclark at redhat.com>
> 
> All commits from https://github.com/ThomasJClark/criu-gui-demo have been
> cherry-picked into p.haul and then squashed together.
> 
> Signed-off-by: Adrian Reber <areber at redhat.com>

Hm... The git am says

fatal: corrupt patch at line 597
Patch failed at 0001 p.haul: merge commits from https://github.com/ThomasJClark/criu-gui-demo

If I save the mail as plain text and try patch --dry-run then

checking file criugui.py
checking file dumprestore.py
checking file procs.py
checking file static/bootstrap.min.css
checking file static/bootstrap.min.js
patch: **** malformed patch at line 560:  andleObj.handler.apply(this,argume ...

-- Pavel


More information about the CRIU mailing list