Re: [more experimients]

2023-10-26 Thread Uwe Brauer
> From: Uwe Brauer > Sent: Wednesday, October 25, 2023 12:16 AM > Subject: [more experimients] (was: single-file-merge?) > You're right. As long as you remember to repeat your 'Single file [Snip]... > The only other thing I'd point out is your test example doesn't give > y

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 ba

[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