[PATCH STABLE] clone: show status "updating to bookmark @"

Thomas Arendsen Hein thomas at intevation.de
Sat Oct 27 02:39:07 CDT 2012


* Adrian Buehlmann <adrian at cadifra.com> [20121026 23:03]:
> On 2012-10-26 22:49, Adrian Buehlmann wrote:
> > # HG changeset patch
> > # User Adrian Buehlmann <adrian at cadifra.com>
> > # Date 1351274290 -7200
> > # Branch stable
> > # Node ID fdbfbcaf9edf51cbc48bbf79145023a86e7c9514
> > # Parent  52c7e171e35563c8f27bd74bc12b2de45fe99fa6
> > clone: show status "updating to bookmark @"
> > 
> > When updating to the @ bookmark, the branch name it is on is rather subordinate
> > and we are updating to that bookmark, not to a branch.

-1 on that from me, I'd like to see the branch name.

Hiding the message if it is "default" would be OK for me though.

Do you intentionally print "updating to bookmark X" only, if the
bookmark is automatically selected (i.e. "@"), not for bookmarks
specified by e.g. -u?

> On 2012-10-26 20:18, Thomas Arendsen Hein wrote:
> > * Adrian Buehlmann <adrian at cadifra.com> [20121026 19:32]:
> >> The branch seems of rather subordinated importance to me in that case.
> > 
> > There still might be a named branch, e.g. right now you will get the
> > stable branch when checking out main or crew, but in after the
> > release it will be the default branch again.

This is my main reason.

> > Additionally to not break software grepping for this for some
> > reason.
>
> I think this change in this output is in-line here and acceptable.

This was just a secondary reason in case my main reason does not
convice everyone, but you convinced me that my secondary reason is
invalid.

> In fact, it is more correct with this change than without,

Hmm, you have a point here. The bookmark might be on a branch, but
not on the tip of that branch, so it somehow is not the branch we
are updating to. On the other hand in the past you could already do
"hg clone -u 123" and whatever branch this changeset lives on was
printed in that message.

> as we have a behavior change anyway.

It is a bugfix to adjust the actions of Mercurial to the expected
behaviour. Or are you talking about updating to the @ bookmark which
was introduced before 2.4-rc?

Regards,
Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner


More information about the Mercurial-devel mailing list