divergent @ bookmark (was Re: [PATCH] clone: update to @ bookmark if it exists)

[Augie Fackler]

On Oct 15, 2012, at 5:04 PM, Matt Mackall wrote:

> Yes, but I'm planning to freeze on Thursday or so. Is more needed than
> this?
> 
> diff -r 9837cafc25b1 mercurial/bookmarks.py
> --- a/mercurial/bookmarks.py	Sat Oct 13 15:10:39 2012 -0500
> +++ b/mercurial/bookmarks.py	Mon Oct 15 17:04:09 2012 -0500
> @@ -214,6 +214,8 @@
>                     changed = True
>                     ui.status(_("updating bookmark %s\n") % k)
>                 else:
> +                    if k == '@':
> +                        k = ''
>                     # find a unique @ suffix
>                     for x in range(1, 100):
>                         n = '%s@%d' % (k, x)

Probably not, I'm just not willing to promise speed on changes like this given how invasive the dircleanup class removal has been (breaking tests in mysterious ways, etc).