stuck in commit/update/push/pull loop

Steve Franks bahamasfranks at gmail.com
Tue Dec 20 10:09:26 CST 2011


> 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. But, hey, if there
weren't special cases, we wouldn't have jobs, right? I'm sure there's
a very good reason for requiring a command to delete.

Matter of fact, requiring a command to delete actually worries me a
bit. It makes me think that rm removes the file from version control
altogether, so it 'forgets' about the file.  I'd personally rather a
deletion was just another reversible delta in the history...doubtless
there's another command for that. I know I can probably glean the
answer to that from the help or the wiki, so unless anyone wants to
chat about the implications, or I'm dead wrong, I'll be over there...

Steve


More information about the Mercurial mailing list