[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: No commit in vc?
From: |
Eli Zaretskii |
Subject: |
Re: No commit in vc? |
Date: |
Fri, 05 Feb 2010 10:44:33 +0200 |
> Date: Thu, 4 Feb 2010 21:07:08 -0800 (PST)
> From: Dan Nicolaescu <address@hidden>
> Cc: Juri Linkov <address@hidden>, Óscar Fuentes <address@hidden>,
> Eli Zaretskii <address@hidden>, address@hidden
>
> Sorry, I somehow missed Juri's message. It seems that this is not
> related to bound branches. It looks like using the existence of
> .bzr/checkout/merge-hashes to detect pending merges is not reliable.
> I'll disable this as soon as I get a chance (if nobody beats me to it).
>
> A better method to figure out the pending merge is needed, otherwise
> this the header is just annoying.
I didn't track this thread, either, so I may be missing something: why
.bzr/checkout/merge-hashes? I thought we agreed to use the flags
displayed by "bzr status" for the fact that there are pending
uncommitted merges.