mercurial patches problem

[Dan Villiom Podlaski Christiansen]

On 28/07/2009, at 17.47, Tanja Baranova wrote:

> hg qapplied
> (nothing!)
>
> hg qpush -a
> abort: local changes found, refresh first

This isn't a terribly helpful message…

> So I cannot apply because local changes found and I cannot refresh  
> patches because they are unapplied. What is the solution?


Whenever you want to push or pop a patch, but have local  
modifications, you basically have three options:

1) Refresh the current patch, if any.
2) Create a new patch using ‘qnew’, possibly using the ‘-f/--force’  
option.
3) Force pushing or popping to proceed. Do note, however, that this  
can lead to a loss of local changes when popping. When pushing with  
modifications, patches may not apply.

I just checked, and the MQ documentation does little to explain how  
pushing and popping actually work. For me, the user interface and  
documentation of MQ leaves a lot to be desired…

--

Dan Villiom Podlaski Christiansen
danchr at gmail.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1943 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20090728/8664c71f/attachment.bin