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

Adrian Reber adrian at lisas.de
Mon Oct 26 02:47:48 PDT 2015


On Fri, Oct 23, 2015 at 06:28:08PM +0300, Pavel Emelyanov wrote:
> On 10/21/2015 04:19 PM, Adrian Reber wrote:
> > On Wed, Oct 21, 2015 at 03:47:26PM +0300, Pavel Emelyanov wrote:
> >> 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 ...
> > 
> > Please try:
> > 
> > http://lisas.de/~adrian/0002-p.haul-merge-commits-from-https-github.com-ThomasJCl.patch
> > 
> > The patch has some very long lines which seem to get truncated in by
> > mail.
> 
> Yup, now OK, but patch #3 has the same issue :( Would you upload it somewhere too?

http://lisas.de/~adrian/0003-p.haul-criu-gui-integration.patch

		Adrian


More information about the CRIU mailing list