Re: conceptual problems with a merge, text is missing

2025-06-12 Thread Uwe Brauer via Mercurial
>>> "BMJ" == Becker, Mischa J writes: > The most likely case is that the merge parent has those lines. They > weren’t added by 1704, 1703, or one of its ancestors, deleted them. As > a result, the only change visible to the merge is the deletion. I am still confused I run hg annotate in 1704 t

RE: conceptual problems with a merge, text is missing

2025-06-12 Thread Becker, Mischa J via Mercurial
, June 12, 2025 5:20 AM To: Mercurial List Subject: conceptual problems with a merge, text is missing ** [EXTERNAL EMAIL]: Do not click links or open attachments unless you recognize the sender and know the content is safe. ** Hi All Situation I have to heads on the default branch ◉ changeset

conceptual problems with a merge, text is missing

2025-06-12 Thread Uwe Brauer via Mercurial
Hi All Situation I have to heads on the default branch #+begin_src ◉ changeset: 1704:57f380a505e7 │ tag: tip │ Branch:default │ Author:Uwe Brauer │ Date: Thu, 12 Jun 2025 08:18:55 +0200 │ Phase: draft │ Parent:1699:5c2a1978c025 │