Problem with merge after a dir rename
Long Vu
long.vu at intelerad.com
Thu Jan 14 17:53:23 UTC 2016
On Thu, Jan 14, 2016 at 11:14 AM, Simon King <simon at simonking.org.uk> wrote:
> On Thu, Jan 14, 2016 at 3:59 PM, Long Vu <long.vu at intelerad.com> wrote:
>>
>> On Wed, Jan 13, 2016 at 10:34 AM, Matt Mackall <mpm at selenic.com> wrote:
>> > On Tue, 2016-01-12 at 15:28 -0500, Long Vu wrote:
>> >> $ hg diff
>> >> abort: java-project/com/package/Source2.java@[a-f0-9]{12}: not found
>> >> in manifest! (re)
>> >> [255]
>> >
>> > Don't know what this is about but I can't seem to repro it.
>>
>> Weird, I can consistently reproduce with our real repo and this toy repo.
>>
>> That said we are on Centos 6 with python 2.6.6 so maybe I should retry
>> with Cento 7 and Python 2.7.5 (the one that came with Centos 7).
>>
>
> I wonder if this is issue4786:
>
> https://bz.mercurial-scm.org/show_bug.cgi?id=4786
>
Exactly the same issue, I've added a new comment
https://bz.mercurial-scm.org/show_bug.cgi?id=4786#c7
--
Long Vu | Build Controller | Intelerad | +1-514-931-6222 ext. 7743
--
This email or any attachments may contain confidential or legally
privileged information intended for the sole use of the addressees. Any
use, redistribution, disclosure, or reproduction of this information,
except as intended, is prohibited. If you received this email in error,
please notify the sender and remove all copies of the message, including
any attachments.
More information about the Mercurial
mailing list