Mercurial > hg
comparison mercurial/templatefilters.py @ 30755:0fbb3a5c188e
rebase: provide detailed hint to abort message if working dir is not clean
Detailed hint message is now provided when 'pull --rebase' operation detects
unclean working dir, for example:
abort: uncommitted changes
(cannot pull with rebase: please commit or shelve your changes first)
Added tests for uncommitted merge, and for subrepo support verifying that same
hint is also passed to subrepo state check.
author | Valters Vingolds <valters@vingolds.ch> |
---|---|
date | Tue, 10 Jan 2017 09:32:27 +0100 |
parents | 032c4c2f802a |
children | 53865692a354 |
comparison
equal
deleted
inserted
replaced
30754:26209cb7184e | 30755:0fbb3a5c188e |
---|