folding commits with renames generates conflicts

[Kastner Masilko, Friedrich]

> From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Cristian Vasile Mocanu
> 
> The problem is that quite often, when I fold a commit into the commit
> above, and there was a file rename involved, I get a conflict, and
> Mercurial asks: "use (c)hanged version or (d)elete?".
> It looks like Mercurial can't apply changes to file which were renamed,
> which is strange since Mercurial has better metadata than GIT (GIT has
> to guess renames whereas Mercurial has the rename metadata so it
> doesn't have to guess).
> 
> I have 2 questions:
> 1) is this a Mercurial bug? If it is, is it reported?
> 2) is there a workaround?

Perhaps it is a shortcoming in the histedit extension, but this is hard to say without an appropriate use-case and a reproducible example.

Could you perhaps provide a stripped-down script to better demonstrate what happens, and a description to show what you think that should happen?

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.