Non recursive update with subrepo's
Kastner Masilko, Friedrich
kastner-masilko at at.festo.com
Thu Jan 30 16:02:14 UTC 2014
> From: Raphael Sebbe [mailto:raphael.sebbe at gmail.com]
>
> I will double-check that, it's possible. I use it mostly through a UI
> (SourceTree), so I need to verify that.
Well, a proper GUI should take this into account, too. TortoiseHg does it by means of presenting a prompt with the options to merge, shelve, or discard changes if it detects dirty working-copies. If "merge" is used, it simply lets Mercurial do its magic on the working-copy merge.
Of course there is always the possibility for a non-standard configuration. You could e.g. set a default to always use -C on update. Perhaps your UI did such nonsense on installation?
Regards,
Fritz
Development Software Systems
Festo Gesellschaft m.b.H.
Linzer Strasse 227
Austria - 1140 Wien
Firmenbuch Wien
FN 38435y
UID: ATU14650108
Tel: +43(1)91075-198
Fax:
www.festo.at
Der Inhalt dieser E-Mail und moeglicher Anhaenge sind ausschliesslich fuer den bezeichneten Adressaten bestimmt.
Jede Form der Kenntnisnahme, Veroeffentlichung, Vervielfaeltigung oder Weitergabe des Inhalts dieser E-Mail und
moeglicher Anhaenge durch unberechtigte Dritte ist unzulaessig. Wir bitten Sie, sich mit dem Absender der E-Mail in
Verbindung zu setzen, falls Sie nicht der Adressat dieser E-Mail sind sowie 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.
More information about the Mercurial
mailing list