--- a/hgext/convert/subversion.py Wed Apr 16 09:35:43 2008 +0200
+++ b/hgext/convert/subversion.py Wed Apr 16 12:09:16 2008 +0200
@@ -688,7 +688,7 @@
if not copyfrompath:
continue
copyfrom[path] = ent
- self.ui.debug("mark %s came from %s:%d\n"
+ self.ui.debug("mark %s came from %s:%d\n"
% (path, copyfrompath, ent.copyfrom_rev))
children = self._find_children(ent.copyfrom_path, ent.copyfrom_rev)
children.sort()
@@ -738,7 +738,7 @@
if root_paths:
path, ent = root_paths[-1]
if ent.copyfrom_path:
- # If dir was moved while one of its file was removed
+ # If dir was moved while one of its file was removed
# the log may look like:
# A /dir (from /dir:x)
# A /dir/a (from /dir/a:y)
@@ -746,7 +746,7 @@
# ...
# for all remaining children.
# Let's take the highest child element from rev as source.
- copies = [(p,e) for p,e in orig_paths[:-1]
+ copies = [(p,e) for p,e in orig_paths[:-1]
if isdescendantof(ent.copyfrom_path, e.copyfrom_path)]
fromrev = max([e.copyfrom_rev for p,e in copies] + [ent.copyfrom_rev])
branched = True
--- a/hgext/mq.py Wed Apr 16 09:35:43 2008 +0200
+++ b/hgext/mq.py Wed Apr 16 12:09:16 2008 +0200
@@ -1903,7 +1903,7 @@
def push(ui, repo, patch=None, **opts):
"""push the next patch onto the stack
-
+
When --force is applied, all local changes in patched files will be lost.
"""
q = repo.mq
--- a/mercurial/cmdutil.py Wed Apr 16 09:35:43 2008 +0200
+++ b/mercurial/cmdutil.py Wed Apr 16 12:09:16 2008 +0200
@@ -1025,7 +1025,7 @@
slowpath = True
break
else:
- ui.warn(_('%s:%s copy source revision cannot be found!\n')
+ ui.warn(_('%s:%s copy source revision cannot be found!\n')
% (file_, short(node)))
continue
for rev, copied in filerevgen(filelog, node):