Mercurial > hg
changeset 10617:da7662ea741f
merge with stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 09 Mar 2010 20:47:35 +0100 |
| parents | 3bb438ce4458 (current diff) 65b178f30eae (diff) |
| children | bcdf37680569 |
| files | mercurial/commands.py |
| diffstat | 4 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Mar 09 19:04:18 2010 +0100 +++ b/mercurial/commands.py Tue Mar 09 20:47:35 2010 +0100 @@ -564,6 +564,10 @@ revs, checkout = hg.addbranchrevs(repo, other, branches, revs) o = repo.findoutgoing(other, force=opts.get('force')) + if not o: + ui.status(_("no changes found\n")) + return + if revs: cg = repo.changegroupsubset(o, revs, 'bundle') else:
--- a/mercurial/demandimport.py Tue Mar 09 19:04:18 2010 +0100 +++ b/mercurial/demandimport.py Tue Mar 09 20:47:35 2010 +0100 @@ -133,6 +133,7 @@ # setuptools' pkg_resources.py expects "from __main__ import x" to # raise ImportError if x not defined '__main__', + '_ssl', # conditional imports in the stdlib, issue1964 ] def enable():
--- a/tests/test-bundle-r Tue Mar 09 19:04:18 2010 +0100 +++ b/tests/test-bundle-r Tue Mar 09 20:47:35 2010 +0100 @@ -72,6 +72,8 @@ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg hg -R test bundle --base 2 test-bundle-all.hg hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg +# empty bundle +hg -R test bundle --base 7 --base 8 test-bundle-empty.hg # issue76 msg2163 hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg