--- a/hgext/relink.py Sat Jan 09 10:47:47 2010 +0100
+++ b/hgext/relink.py Sat Jan 09 23:16:48 2010 +0100
@@ -48,7 +48,7 @@
try:
remotelock = src.lock()
try:
- candidates = collect(src.store.path, ui)
+ candidates = sorted(collect(src.store.path, ui))
targets = prune(candidates, src.store.path, repo.store.path, ui)
do_relink(src.store.path, repo.store.path, targets, ui)
finally:
--- a/mercurial/commands.py Sat Jan 09 10:47:47 2010 +0100
+++ b/mercurial/commands.py Sat Jan 09 23:16:48 2010 +0100
@@ -2443,7 +2443,7 @@
will be overwritten if the merge is retried with resolve. The
-m/--mark switch should be used to mark the file as resolved.
- You can specify a set of files to operate on, or use the -a/-all
+ You can specify a set of files to operate on, or use the -a/--all
switch to select all unresolved files.
This command also allows listing resolved files and manually