Show More
| @@ -25,11 +25,11 b' def addcommit(name, time):' | |||||
| 25 |
|
25 | |||
| 26 |
|
26 | |||
| 27 | def update(rev): |
|
27 | def update(rev): | |
| 28 | merge.update(repo, rev, branchmerge=False, force=True) |
|
28 | merge.clean_update(repo[rev]) | |
| 29 |
|
29 | |||
| 30 |
|
30 | |||
| 31 | def merge_(rev): |
|
31 | def merge_(rev): | |
| 32 | merge.update(repo, rev, branchmerge=True, force=False) |
|
32 | merge.merge(repo[rev]) | |
| 33 |
|
33 | |||
| 34 |
|
34 | |||
| 35 | if __name__ == '__main__': |
|
35 | if __name__ == '__main__': | |
General Comments 0
You need to be logged in to leave comments.
Login now