Mercurial > hg
changeset 10231:9bf3ebdb19ae stable
merge stable together
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 11 Jan 2010 22:41:02 +0100 |
| parents | 6521605bc200 (diff) 9df52218810d (current diff) |
| children | 69e07d234cc6 ecd0a5c8bbe5 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/relink.py Mon Jan 11 21:44:04 2010 +0100 +++ b/hgext/relink.py Mon Jan 11 22:41:02 2010 +0100 @@ -46,7 +46,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 Mon Jan 11 21:44:04 2010 +0100 +++ b/mercurial/commands.py Mon Jan 11 22:41:02 2010 +0100 @@ -2460,7 +2460,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