187
edits
ReleaseEngineering/TryServer: Difference between revisions
Jump to navigation
Jump to search
→hg phases causing "abort: popping would remove an immutable revision"
| Line 39: | Line 39: | ||
</pre> | </pre> | ||
=== hg phases | === hg phases === | ||
<p>[http://mercurial.selenic.com/wiki/Phases hg phases] were introduced in Mercurial 2.1. Their purpose is to keep you from accidentally modifying changesets you've shared with others. In particular, this keeps you from qpop'ing patches you've pushed to try! | <p>[http://mercurial.selenic.com/wiki/Phases hg phases] were introduced in Mercurial 2.1. Their purpose is to keep you from accidentally modifying changesets you've shared with others, or from accidentally sharing your patch queue with others. In particular, this keeps you from pushing patches to try and from qpop'ing patches you've pushed to try! | ||
In order to get pushing to try to work, you'll need to add the following to your ~/.hgrc: | |||
<pre>[mq] | |||
secret = false</pre> | |||
qpop and qpush your patch queue and you should be able to push again. | |||
But now when you qpop, you'll get | |||
<pre>abort: popping would remove an immutable revision</quote> | |||
You can force hg to let you <tt>qpop</tt> your patch queue by running | You can force hg to let you <tt>qpop</tt> your patch queue by running | ||
<pre>hg phase -f --secret qparent:tip</pre> | <pre>hg phase -f --secret qparent:tip</pre> | ||
There's probably a better way to make hg allow you to qpop your patches, but I haven't figured it out. If you figure it out, please update this page! | |||
=== Viewing the results === | === Viewing the results === | ||