Merge branch 'maint'

Conflicts:
	Changelog.draft.rst
	Makefile
This commit is contained in:
Nicolas Sebrecht
2011-03-24 19:07:34 +01:00
3 changed files with 27 additions and 1 deletions

View File

@ -363,4 +363,5 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
raise
except:
ui.warn("ERROR in syncfolder for %s folder %s: %s" % \
(accountname,remotefolder.getvisiblename(),sys.exc_info()[1]))
(accountname,remotefolder.getvisiblename(),
traceback.format_exc()))