Mercurial > hg
changeset 10232:826bb566541c
merge crew together
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 11 Jan 2010 22:41:24 +0100 |
| parents | 192c39586787 (diff) 9f0c7be7c46c (current diff) |
| children | 69e07d234cc6 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/relink.py Mon Jan 11 21:45:28 2010 +0100 +++ b/hgext/relink.py Mon Jan 11 22:41:24 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 Mon Jan 11 21:45:28 2010 +0100 +++ b/mercurial/commands.py Mon Jan 11 22:41:24 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
--- a/mercurial/subrepo.py Mon Jan 11 21:45:28 2010 +0100 +++ b/mercurial/subrepo.py Mon Jan 11 22:41:24 2010 +0100 @@ -312,7 +312,7 @@ def remove(self): if self.dirty(): - self._repo.ui.warn(_('not removing repo %s because' + self._repo.ui.warn(_('not removing repo %s because ' 'it has changes.\n' % self._path)) return self._repo.ui.note('removing subrepo %s\n' % self._path)