Hi All
Situation
I have to heads on the default branch
#+begin_src
◉ changeset: 1704:57f380a505e7
│ tag: tip
│ Branch: default
│ Author: Uwe Brauer <o...@mat.ucm.es>
│ Date: Thu, 12 Jun 2025 08:18:55 +0200
│ Phase: draft
│ Parent: 1699:5c2a1978c025
│ Summary: Add create dummy head
│
│ ○ changeset: 1703:1a62f0f1e1df
│ │ Branch: default
│ │ Author: Author 2 <u...@gmail.com>
│ │ Date: Tue, 10 Jun 2025 07:52:17 +0300
│ │ Phase: public
│ │ Summary: typos
#+end_src
Now
hg diff -r 1704 -r 1703
Results in
#+begin_src
diff --git a/section3-energy-estimates.tex b/section3-energy-estimates.tex
--- a/section3-energy-estimates.tex
+++ b/section3-energy-estimates.tex
@@ -4,7 +4,7 @@
% Doc:
/home/oub/ALLES/HGs/Karp/Pub/Preprints/Full-Euler-Nordstroem/section3-energy-estimates.tex
% Original Author: Uwe Brauer o...@mat.ucm.es
% Created: Sun Dec 15 2024
-%
+%
\documentclass[manuscript.tex]{subfiles}
% eq:energy:2
\usepackage{xr-hyper}
@@ -27,18 +27,6 @@
\xxcommentinline{What is the meaning of ''decaying estimates''? How can an
estimate
being decaying? A function can be decaying.}
-\ubcommentmultiline{decay}{
- \begin{equation}
- \label{eq:section3-energy-estimates:10}
- \frac{dE}{dt}\leq -E
- \end{equation}
-is decaying
-\begin{equation}
- \label{eq:section3-energy-estimates:11}
- \frac{dE}{dt}\leq +E
-\end{equation}
-is not decaying. It is an abreviation, what do you propose?
-}
#+end_src
Interpretation the text starting with =-= is absent in 1703 but present in 1704
Test
hg diff -r 1703 -r 1704
#+begin_src
--- a/section3-energy-estimates.tex
+++ b/section3-energy-estimates.tex
@@ -4,7 +4,7 @@
% Doc:
/home/oub/ALLES/HGs/Karp/Pub/Preprints/Full-Euler-Nordstroem/section3-energy-estimates.tex
% Original Author: Uwe Brauer o...@mat.ucm.es
% Created: Sun Dec 15 2024
-%
+%
\documentclass[manuscript.tex]{subfiles}
% eq:energy:2
\usepackage{xr-hyper}
@@ -27,6 +27,18 @@
\xxcommentinline{What is the meaning of ''decaying estimates''? How can an
estimate
being decaying? A function can be decaying.}
+\ubcommentmultiline{decay}{
+ \begin{equation}
+ \label{eq:section3-energy-estimates:10}
+ \frac{dE}{dt}\leq -E
+ \end{equation}
+is decaying
+\begin{equation}
+ \label{eq:section3-energy-estimates:11}
+ \frac{dE}{dt}\leq +E
+\end{equation}
+is not decaying. It is shortcut phrase, what do you propose
+}
#+end_src
So I want a merge in which this text starting
=+\ubcommentmultiline{decay}{=
In included so I thought
hg up -r 1703
hg merge -r 1704
Would do the trick, but no.
So I strip the merge
hg up -r 1704
hg merge -r 1703
And again no the text is *not* included, what do miss here??
regards
Uwe Brauer
-- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine.
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Mercurial mailing list Mercurial@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial
