Why can't I merge when there are uncommitted outstanding changes?

[Kastner Masilko, Friedrich]

In your case I'd propose a setup using a second working-copy (to do the merge/rebase/whatnot work) by means of using the share extension. If you have your project in e.g. /path/to/project , do "hg share /path/to/project /path/to/workplace".

You will then have all repository elements shared between the two directories, but separate working-copies. You could do all your development work in /project/, but repo-maintenance in /workplace/. You'd have to "hg up" your /project/-working-copy to revisions created by merge/rebase in /workplace/ , though, but this is just like SVN, then.

Regards,
Fritz

Development Software Systems
Festo Gesellschaft m.b.H.
Linzer Strasse 227
Austria - 1140 Wien

Firmenbuch Wien
FN 38435y

Tel: +43(1)91075-198
Fax: +43(1)91075-282
www.festo.at

Der Inhalt dieses E-Mails ist ausschliesslich fuer den bezeichneten Adressaten bestimmt. Jede Form der Kenntnisnahme,
Veroeffentlichung, Vervielfaeltigung oder Weitergabe des Inhalts dieses E-Mails durch unberechtigte Dritte ist unzulaessig. Wir
bitten Sie, sich mit dem Absender des E-Mails in Verbindung zu setzen, falls Sie nicht der Adressat dieses E-Mails sind und das
Material von Ihrem Computer zu loeschen. 

This e-mail and any attachments are confidential and intended solely for the addressee. The perusal, publication, copying or
dissemination of the contents of this e-mail by unauthorised third parties is prohibited. If you are not the intended recipient of this
e-mail, please delete it and immediately notify the sender.