stuck in commit/update/push/pull loop

[Scott Palmer]

On 2011-12-20, at 11:09 AM, Steve Franks wrote:

>> I bet you a nickel that'll get you unstuck. But then so would actually
>> running 'hg rm' on the missing files, committing your changes, then
>> merging.
> 
> Thanks for the help!
> 
> You know, you sound a tad defensive about the huge POLS violation that
> is requiring a command to delete a file.  All the other tools (except
> maybe git which I'm not familiar with) treat a deletion just like any
> other modification: something to be committed. 

I can't recall any version control tools that do that.  Subversion doesn't for example.  I'm sure there are some, but I would say that they are the exception.

I see your argument though.  It could be treated as "just another change", but your assertion that all the other tools work that way is wrong.

Scott