| ... | ... |
@@ -10,5 +10,5 @@ |
| 10 | 10 |
""" |
| 11 | 11 |
exit(0) |
| 12 |
plist = os.popen("hg parents --template='{rev}\n'").readlines()
|
|
| 12 |
plist = os.popen("HGRCPATH='' hg parents --template='{rev}\n'").readlines()
|
|
| 13 | 13 |
if len(plist)>1: |
| 14 | 14 |
print "You are in the process of merging" |
| ... | ... |
@@ -16,5 +16,6 @@ |
| 16 | 16 |
PAR = int(plist[0]) |
| 17 | 17 |
|
| 18 |
f = os.popen("hg log -r 0:tip --template='{rev} {parents}\n'").
|
|
| 18 |
f = os.popen("HGRCPATH='' hg log -r 0:tip --template='{rev} {parents}\n'").\
|
|
| 19 |
readlines() |
|
| 19 | 20 |
REV = -1 |
| 20 | 21 |
lengths=[] |
0 comments (0 inline)