Ignoring changed files

[Steve Borho]

On Saturday 02 December 2006 03:22, Thomas Arendsen Hein wrote:
> * Chui Tey <teyc at cognoware.com> [20061201 13:42]:
<snip>
> - Use the mq extension to track changes to config.php:
>   $ hg qnew mylocalconfig
>   $ $EDITOR config.php
>   $ hg qrefresh
>   Whenever you want to pull in new changes from the original
>   repository, you need some extra steps:
>   $ hg qpop -a  # removes your local config.php changes
>   $ hg pull
>   $ hg update
>   $ hg qpush -a # adds your local config.php changes again
>
> Today I'm mostly using the mq solution.


I use this solution as well.  The only drawback is that I sometimes forget the 
qpop -a step and end up having to do some nasty things with clone -r to get 
my repo in a sane state again.

Is there some way to force the pull to fail if there are locally applied 
patches?

--
Steve
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20061203/8b40e501/attachment.pgp