projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5a47f9
)
Merger.js
author
Alan Knowles
<alan@akbkhome.com>
Mon, 12 Sep 2011 10:07:26 +0000
(18:07 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Mon, 12 Sep 2011 10:07:26 +0000
(18:07 +0800)
Merger.js
patch
|
blob
|
history
diff --git
a/Merger.js
b/Merger.js
index
0edf41a
..
2f47bf8
100644
(file)
--- a/
Merger.js
+++ b/
Merger.js
@@
-588,14
+588,13
@@
Merger=new XObject({
var files = this.get('/changedFilesView').files();
-
- var diff = Merger.repo.diff(files, model.release, model.rev);
-
- if (!files.length) {
+ if (!files.length) {
return; // error.!
}
- print("Files: " + JSON.stringify(files));
- return;
+ var diff = Merger.repo.diff(files, model.release, model.rev);
+
+
+
var log = Merger.repo.history(files, 1, 'rev', model.rev + '..' + model.release);