Showing content from http://mail.python.org/pipermail/python-dev/attachments/20131105/bdcef159/attachment.html below:
<p dir="ltr"><br>
On 5 Nov 2013 02:03, "Guido van Rossum" <<a href="mailto:guido@python.org">guido@python.org</a>> wrote:<br>
><br>
> Two more approaches that can help when you haven't pushed yet:<br>
><br>
> - hg rollback undoes the most recent local commit while leaving the local workspace unchanged so the files are now patched but not committed<br>
><br>
> - hg strip <rev> deletes a revision and all its descendents (requires some extension to be configured); it also rolls back your workspace so you'd have to repatch using hg import --no-commit.</p>
<p dir="ltr">A couple more tips:</p>
<p dir="ltr">- I actually have "--no-commit" configured as a standard option for hg import in my .hgrc file so I never forget</p>
<p dir="ltr">- "hg pull --rebase" avoids having a merge in the history for push races that involve only default branch changes</p>
<p dir="ltr">- hg histedit is a quite useful extension for adjusting commit history prior to publication.</p>
<p dir="ltr">(most of the history editing mercurial features require enabling the appropriate extensions, but it's well worth taking the time to do so - git users in particular may find that appropriate use of extensions enables a more familiar local user experience)</p>
<p dir="ltr">Cheers,<br>
Nick.</p>
<p dir="ltr">><br>
> (BTW everybody here knows you can give hg import a URL straight from Rietveld's "raw diff download" right?)<br>
><br>
><br>
> On Mon, Nov 4, 2013 at 1:04 AM, Oleg Broytman <<a href="mailto:phd@phdru.name">phd@phdru.name</a>> wrote:<br>
>><br>
>> Hi!<br>
>><br>
>> On Mon, Nov 04, 2013 at 03:56:25AM -0500, Terry Reedy <<a href="mailto:tjreedy@udel.edu">tjreedy@udel.edu</a>> wrote:<br>
>> > The one<br>
>> > thing I tried but could not do was to directly change status 'A'<br>
>> > back to '?'.<br>
>><br>
>> hg forget file<br>
>><br>
>> Oleg.<br>
>> --<br>
>> Oleg Broytman <a href="http://phdru.name/">http://phdru.name/</a> <a href="mailto:phd@phdru.name">phd@phdru.name</a><br>
>> Programmers don't die, they just GOSUB without RETURN.<br>
>> _______________________________________________<br>
>> Python-Dev mailing list<br>
>> <a href="mailto:Python-Dev@python.org">Python-Dev@python.org</a><br>
>> <a href="https://mail.python.org/mailman/listinfo/python-dev">https://mail.python.org/mailman/listinfo/python-dev</a><br>
>> Unsubscribe: <a href="https://mail.python.org/mailman/options/python-dev/guido%40python.org">https://mail.python.org/mailman/options/python-dev/guido%40python.org</a><br>
><br>
><br>
><br>
><br>
> -- <br>
> --Guido van Rossum (<a href="http://python.org/~guido">python.org/~guido</a>)<br>
><br>
> _______________________________________________<br>
> Python-Dev mailing list<br>
> <a href="mailto:Python-Dev@python.org">Python-Dev@python.org</a><br>
> <a href="https://mail.python.org/mailman/listinfo/python-dev">https://mail.python.org/mailman/listinfo/python-dev</a><br>
> Unsubscribe: <a href="https://mail.python.org/mailman/options/python-dev/ncoghlan%40gmail.com">https://mail.python.org/mailman/options/python-dev/ncoghlan%40gmail.com</a><br>
><br>
</p>
RetroSearch is an open source project built by @garambo
| Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4