abort: outstanding uncommitted changes
Created originally on Bitbucket by FlorianGeorge
Since TortoiseHg 2.2.2, I am having the issue that in combination with hgSubversion, when pushing multiple revisions, the process doesn't work anymore properly.
The intended behavior is (and was working like this): {{{ Pull All New Push 1 Rebase All Remaining Pull All New Push 1 Rebase All Remaining ...and so on... }}}
Now (since 2.2.2) the behavior is: {{{ Pull All New Push 1 abort: outstanding uncommitted changes }}}
Here's the log output.
Not working:
TortoiseHg 2.4 HgSubversion Rev 910 "Ignore invalid utf8 in commit messages" {{{ % hg --repository V:\Development push https://xxx.xxx.xxx.xxx:xxxx/svn/CCDev/trunk pushing to https://xxx.xxx.xxx.xxx:xxxx/svn/CCDev/trunk http authorization required realm: Subversion Repositories http authorization required realm: Subversion Repositories http authorization required realm: Subversion Repositories searching for changes [r14153] my_name: description pulled 1 revisions abort: outstanding uncommitted changes [command returned code 255 Wed Jun 06 15:08:28 2012] }}}
Working:
TortoiseHg 2.1.4 HgSubversion Rev 910 "Ignore invalid utf8 in commit messages" {{{ % hg --repository V:\Development push https://xxx.xxx.xxx.xxx:xxxx/svn/CCDev/trunk pushing to https://xxx.xxx.xxx.xxx:xxxx/svn/CCDev/trunk http authorization required realm: Subversion Repositories http authorization required realm: Subversion Repositories http authorization required realm: Subversion Repositories searching for changes [r14154] my_name: description pulled 1 revisions saved backup bundle to V:\Development.hg\strip-backup\89f08b6a8dab-backup.hg [r14155] my_name: description pulled 1 revisions saved backup bundle to V:\Development.hg\strip-backup\91ca77e5b969-backup.hg [r14156] other_name: description [r14157] my_name: description pulled 2 revisions ... [command completed successfully Wed Jun 06 16:32:36 2012] }}}
Attachments: screenshot1