From 8e20460fed4f35b624b53f4a1ccb3dd48727d544 Mon Sep 17 00:00:00 2001 From: Gubolin Date: Sun, 14 Sep 2014 11:05:57 +0200 Subject: WIP --- github.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'github.js') diff --git a/github.js b/github.js index 3d46578..0dc6ab5 100644 --- a/github.js +++ b/github.js @@ -179,10 +179,14 @@ GitHubBackend.prototype.saveProject = function (commitMessage, parentCommitSha, // diff parent <-> local codePatch = dmp.patch_make(parentCode, localCode); notePatch = dmp.patch_make(parentNotes, localNotes); - console.log(dmp.patch_toText(codePatch));//DEBUG + console.log(JSON.stringify(codePatch));//DEBUG // patch (parent<->local) => head - localCode = dmp.patch_apply(codePatch, headCode)[0]; - localNotes = dmp.patch_apply(notePatch, headNotes)[0]; + localCode = dmp.patch_apply(codePatch, headCode); + localNotes = dmp.patch_apply(notePatch, headNotes); + console.log('Code patched successfully? ' + localCode[1]); + console.log('Notes patched successfully? ' + localNotes[1]); + localCode = localCode[0]; + localNotes = localNotes[0]; // perform a `git merge` // TODO TODO TODO 422 Not a fast-forward -- cgit v1.3.1