[PATCH 2 of 2] update: note ways to avoid moving bookmark

Kevin Bullock kbullock+mercurial at ringworld.org
Fri Jan 20 12:54:28 CST 2012


On 20 Jan 2012, at 12:01 PM, Matt Mackall wrote:

> On Thu, 2012-01-19 at 16:10 -0600, Kevin Bullock wrote:
>> # HG changeset patch
>> # User Kevin Bullock <kbullock at ringworld.org>
>> # Date 1327011026 21600
>> # Branch stable
>> # Node ID f5692b6fe59506e83d0fa40def323604cbdc70f5
>> # Parent  d674b59e76ef18798c9e59b5b574150999430852
>> update: note ways to avoid moving bookmark
> 
> Not convinced we need this. A simple reference to the bookmarks page
> might be sufficient.

That seems plausible. I'll send a new patch.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

> 
>> diff --git a/mercurial/commands.py b/mercurial/commands.py
>> --- a/mercurial/commands.py
>> +++ b/mercurial/commands.py
>> @@ -5674,6 +5674,10 @@
>>     If you want to revert just one file to an older revision, use
>>     :hg:`revert [-r REV] NAME`.
>> 
>> +    To avoid moving the current bookmark forward, give the current
>> +    branch name explicitly as REV, or deactivate the current bookmark
>> +    with :hg:`bookmark --inactive` before updating.
>> +
>>     See :hg:`help dates` for a list of formats valid for -d/--date.
>> 
>>     Returns 0 on success, 1 if there are unresolved files.
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at selenic.com
>> http://selenic.com/mailman/listinfo/mercurial-devel
> 
> 
> -- 
> Mathematics is the supreme nostalgia of our time.
> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120120/2c6a9faf/attachment.html>


More information about the Mercurial-devel mailing list