Mercurial > hg
comparison mercurial/hg.py @ 171:75dddd697ed4
trivial tweak to merge3
author | mpm@selenic.com |
---|---|
date | Thu, 26 May 2005 18:20:24 -0800 |
parents | f38c90953c2c |
children | 1d8e9637a0a4 |
comparison
equal
deleted
inserted
replaced
170:e6c621a825f2 | 171:75dddd697ed4 |
---|---|
806 text = open(a).read() | 806 text = open(a).read() |
807 os.unlink(a) | 807 os.unlink(a) |
808 os.unlink(b) | 808 os.unlink(b) |
809 os.unlink(c) | 809 os.unlink(c) |
810 | 810 |
811 return fl.addrevision(text, transaction, link, my, other) | 811 return fl.add(text, transaction, link, my, other) |
812 | 812 |
813 class remoterepository: | 813 class remoterepository: |
814 def __init__(self, ui, path): | 814 def __init__(self, ui, path): |
815 self.url = path.replace("hg://", "http://", 1) | 815 self.url = path.replace("hg://", "http://", 1) |
816 self.ui = ui | 816 self.ui = ui |