Re: Mercurial node is not well formed error message

[John W. Eaton]

On 04/11/2018 09:24 PM, Daniel J Sebald wrote:

> My .hgtags file looks fine on the stable branch.  However, I'm looking 
> at the Browse At Revision feature of thg and see that the .hgtags file 
> has on the default head
>
> 708a4fcb73820484a3af94dd4d18453c4d9b29c9 release-4-2-0
> 1327ea4f5a931a6cc2a6d4790af58cf16de4702b release-4-2-1
> <<<<<<< working copy
> 94f8e2b5a88b79974084c0ae541cacbcc62d64f6 release-4-2-2
> =======
> a5ad9c053e41ed39a8c69ff99936cbcf18256abf rc-4-3-90
>  >>>>>>> merge rev
>
> so I now see where the '>>>>>>>' is coming from in the warning message. 
> (Originally I thought it was simply an attention grabber.)  Has there 
> been an incomplete merge somewhere recently?  Here's a discussion on 
> this warning:

Oops, I don't know how hg allowed me to push a commit with a merge 
conflict like that.  In any case, I fixed the file and pushed.  Can you 
pull and update now?

jwe