Issue #353 resolved

abort: outstanding uncommitted changes

FlorianGeorge
created an issue

I posted this originally on the tortoiseHg Bug Tracker, but the following commit to hgSubversion suggests that the issue might also be stemming from, or at least may alternatively be fixed on this side:

Rev 882 {{{ svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2

hg 2.2 is trying harder to see through our lies but we will prevail. Override subrepo.basestate() so we can pretend the svn revision number is HEAD, honest. }}}

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] }}}

Comments (4)

  1. Konstantin Tkachenko

    I've got the same (similar) problem working with subversion repository with non-ascii characters. See https://bitbucket.org/tortoisehg/thg/issue/1947/abort-outstanding-uncommitted-changes#comment-1820083. I wonder, is it really impossible to take account of subversion character-handling during pushing? The files with such names can be pulled, can be compared and so on. I've read article under http://mercurial.selenic.com/wiki/EncodingStrategy. And the mercurial encoding strategy seems to support unicode file names in general and only produces "human readability issues" and "make problem". But failing to push/rebase doesn't seems to be a "human readability issue". I have the Windows with some regionally encoding used.

  2. Log in to comment