projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f13f9d
)
Merger.js
author
Alan Knowles
<alan@akbkhome.com>
Mon, 12 Sep 2011 10:08:46 +0000
(18:08 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Mon, 12 Sep 2011 10:08:46 +0000
(18:08 +0800)
Merger.js
patch
|
blob
|
history
diff --git
a/Merger.js
b/Merger.js
index
2f47bf8
..
050b125
100644
(file)
--- a/
Merger.js
+++ b/
Merger.js
@@
-594,11
+594,12
@@
Merger=new XObject({
var diff = Merger.repo.diff(files, model.release, model.rev);
-
+ print("history?");
+
- var
log
= Merger.repo.history(files, 1, 'rev', model.rev + '..' + model.release);
+ var
history
= Merger.repo.history(files, 1, 'rev', model.rev + '..' + model.release);
- print(
JSON.stringify(log
));
+ print(
"History" + JSON.stringify(history
));
Commit = imports.Commit.Commit;
Commit.repo = Merger.repo;