Mercurial > hg
comparison mercurial/merge.py @ 15634:cfc15cbecc5e stable
diff: don't crash when diffing a revision with a deleted subrepo (issue3153)
When a user requested a diff between a revision (r1) that contained a subrepo
and another (r2) that did not, mercurial would crash if r1 was specified before
r2 but would execute the diff otherwise. This fixes this behavior by skipping
the missing subrepo in the diff.
author | Renato Cunha <renato@renatocunha.com> |
---|---|
date | Wed, 14 Dec 2011 12:28:00 -0200 |
parents | b0a88bda3381 |
children | 6c8573dd1b6b 7f01ad702405 |
comparison
equal
deleted
inserted
replaced
15633:dc5d1394ecd1 | 15634:cfc15cbecc5e |
---|