hg import when there are uncommitted changes

[Matt Mackall]

On Sat, Jul 16, 2005 at 09:54:19PM -0400, Dan Christensen wrote:
> I was a bit surprised to find that if I have uncommitted changes in
> the working directory, and I run "hg import file.patch", my
> uncommitted changes are committed along with the changes in the
> patch.  I expected behaviour more like "hg pull", which applies the
> changes to the repository, so I would then have to "hg update" and
> the merge would get recorded as a separate piece of history.
> 
> Alternatively, "hg import" could just abort if there are uncommitted
> changes, unless given a "--force" flag.

Done.

-- 
Mathematics is the supreme nostalgia of our time.