Mercurial > hg

diff mercurial/merge.py @ 15750:03d04296cfab stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: improve exception reporting for SVN logstream - catch all exceptions - pickle a stringified version of the exception - use a normal abort Hopefully this will result in less mysterious convert exceptions
author Matt Mackall <mpm@selenic.com>
date Fri, 30 Dec 2011 15:47:58 -0600
parents d550168f11ce
children 7b7f03502b5a
line wrap: on
line diff