[Bug 6848] New: hg incoming: unknown exception encountered

2023-10-25 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6848 Bug ID: 6848 Summary: hg incoming: unknown exception encountered Product: Mercurial Version: 6.5.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

Re: Rustext's DirstateItem has no attribute 'v2_data', fsmonitor tries to access it.

2023-10-25 Thread Sietse Brouwer
Hi Raphael, > Can I ask why you're using fsmonitor? I use hg-prompt in my shell prompt, and enabling fsmonitor made my prompt render faster. Would need to test whether the difference is still meaningful, the setting has been in my config for a while now. I can send in the pfix to make fsmonitor

RE: [more experimients] (was: single-file-merge?)

2023-10-25 Thread Becker, Mischa J
From: Uwe Brauer Sent: Wednesday, October 25, 2023 12:16 AM Subject: [more experimients] (was: single-file-merge?) > > > I'm pretty sure all those file changes you threw away in the merge > > from meta to default will get stripped from meta if you later merge > > default back into meta. > > > I

[more experimients] (was: single-file-merge?)

2023-10-25 Thread Uwe Brauer
> I'm pretty sure all those file changes you threw away in the merge > from meta to default will get stripped from meta if you later merge > default back into meta. I tried the following hg init echo "First" > test.org hg add test.org hg commit -m "0: First" echo "Second" >> test.org hg