Why can't I merge when there are uncommitted outstanding changes?
Matt Mackall
mpm at selenic.com
Thu Apr 22 12:16:10 CDT 2010
On Thu, 2010-04-22 at 07:49 -0700, Aardwolf wrote:
> I'm sorry, but I tried this shelve extension, and it simply doesn't work for
> me.
I really really wish people wouldn't reach for extensions as the first
line of advice. It only adds more complexity to existing confusion.
The "shelve" operation is conceptually no more than:
hg diff > somefile # save local changes
hg revert -a # nuke 'em
And "unshelve" is simply:
hg import --no-commit somefile
I do this occasionally, but I actually rarely find "shelving" necessary.
And I've never needed the shelve extension. For the first couple years
of Mercurial development, I didn't use mq either, so I always cringe
when people advise beginners to use it. None of the extensions are
essential, folks.
ps: some folks might want diff -g.
--
http://selenic.com : development and support for Mercurial and Linux
More information about the Mercurial
mailing list