summaryrefslogtreecommitdiff
path: root/tools/merge_fetch.py
Commit message (Collapse)AuthorAgeFilesLines
* Remove debug printouts from merge programs.Linus Nordberg2015-11-201-1/+1
|
* Fix _args -> args since we now use it.Linus Nordberg2015-11-101-1/+1
|
* Print the string "timing" and the name of the program in merge timing info.Linus Nordberg2015-11-101-1/+1
|
* Print timing information in merge_fetch too.Linus Nordberg2015-11-101-0/+4
|
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-12/+36
| | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0
* Split merge.py into three pieces.Linus Nordberg2015-11-101-0/+97