|
| From: | Daniel J Sebald |
| Subject: | Re: @ not @ tip |
| Date: | Thu, 28 Nov 2013 11:43:48 -0600 |
| User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Thunderbird/3.1.16 |
On 11/28/2013 11:19 AM, John W. Eaton wrote:
On 11/28/2013 11:36 AM, Daniel J Sebald wrote:The tagless @ bookmark fell behind about a dozen changesets ago or thereabouts. (We just merge on the client end, right? It then resolves itself when the canonical repository is merged?)In my archive, @ is still on the most recent changeset of the default branch (9acd7b0f0639). Is that not where it is supposed to be?
OK, guess I didn't understand the organization. (And avoiding the merge conflict is easy using "hg update tip".) The @ as I understand it is a temporary branch that once it is merged is forgotten about. Maybe we should have a tag @stable or something. Anyway, I now know how to resolve things on the client side.
Dan
| [Prev in Thread] | Current Thread | [Next in Thread] |