projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f82bad
)
Merger.js
author
Alan Knowles
<alan@akbkhome.com>
Tue, 13 Sep 2011 13:27:51 +0000
(21:27 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Tue, 13 Sep 2011 13:27:51 +0000
(21:27 +0800)
Merger.js
patch
|
blob
|
history
diff --git
a/Merger.js
b/Merger.js
index
438f2e4
..
96be231
100644
(file)
--- a/
Merger.js
+++ b/
Merger.js
@@
-619,6
+619,10
@@
Merger=new XObject({
if (ce === false ) {
return;
}
+
+ var diff = Merger.repo.diff(files, model.release, model.rev);
+
+
print(JSON.stringify(ce,null,4));
//.... commit!!!
@@
-626,6
+630,7
@@
Merger=new XObject({
Merger.repo.checkout(model.release);
+ Merget.repo.applyPatch(diff);
Merger.repo.checkout(model.working);