[issue2272] hg update message could use improvement: origin rev has locally changed file that target rev has deleted

[Faheem Mitha]

New submission from Faheem Mitha <faheem at email.unc.edu>:

faheem at orwell[dbscript branch:rev 1207]:~/snppy$ hg st -mard
A SimData/affy6pids.py

faheem at orwell[default branch:rev 1410]:~/snppy$ hg up 1200
 local changed SimData/affy6pids.py which remote deleted
use (c)hanged version or (d)elete?                    

A couple of things to note here:

1) This message doesn't appear if there are no local changes. It is asking if it 
is to keep the current version of SimData/affy6pids.py (with the local changes) 
unmodified or just delete it on update to 1200. Not at all clear from the message.

2) There is no local/remote. It is the same repository. Something like origin and 
destination/target would be better, I think.

In fact something like

origin revision (1410) has local changes for SimData/affy6pids.py which target 
revision (1200) has deleted
use (l)ocally modified version or (d)elete? 

would be even better.
                                                                 Regards, Faheem.

----------
messages: 13003
nosy: faheem
priority: wish
status: unread
title: hg update message could use improvement: origin rev has locally changed file that target rev has deleted

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2272>
____________________________________________________