Package: git
Version: 1:1.7.7.3-1
Severity: normal
Dear Maintainer,
Executing git diff I remarked an apparently inconsistent text following a patch
header @@ ... @@.
Here's a snippet:
$ cat _diff-u #OUTPUT FROM DIRECT diff -u
@@ -3713,9 +3737,7 @@
for any
$
\lrp{\Lambda_0,\Lambda,p_\rng{3},\mu}$ in
-$\LazLaPMu{3}$.
-(In the first inequality, $\normw{\miw}>0$.)
-The degrees of the polynomials satisfy:
+$\LazLaPMu{3}$, where
\begin{flalign}
\deg\polyPZ_{4,\NL,\normw{\miw}}
\le
@@ -3732,106 +3754,85 @@
\label{L.bd.degP.4}
\end{flalign}
}
-The proof of the equivalence goes as follows.
+\textbf{Proof of the equivalence between
+\eqref{L.bd}, \eqref{L.bd.degP} and
+\eqref{L.bd.4}, \eqref{L.bd.degP.4}.}
Fix $\NL\in\NonNegIntegers$.
-Prove first that~\eqref{L.bd.4}
$ cat _gitdiff # OUTPUT FROM git diff
-&\le
+&\stackrel{\phantom{\normw{\miw}>0}}{\le}
\polyPZ_{4,\NL,0}
\bigglrp{
\logp{
@@ -3713,9 +3737,7 @@ $\polyPZ_{4,\NL,\normw{\miw}}$, such that,
for any
$
\lrp{\Lambda_0,\Lambda,p_\rng{3},\mu}$ in
-$\LazLaPMu{3}$.
-(In the first inequality, $\normw{\miw}>0$.)
-The degrees of the polynomials satisfy:
+$\LazLaPMu{3}$, where
\begin{flalign}
\deg\polyPZ_{4,\NL,\normw{\miw}}
\le
@@ -3732,106 +3754,85 @@ The degrees of the polynomials satisfy:
\label{L.bd.degP.4}
\end{flalign}
}
-The proof of the equivalence goes as follows.
+\textbf{Proof of the equivalence between
+\eqref{L.bd}, \eqref{L.bd.degP} and
as you may remark git diff gives a patch header
@@ -3713,9 +3737,7 @@ The degrees of the polynomials satisfy:
where "The degrees of the polynomials satisfy:" that is actually found in line
3718 of the old file.
I attach the files obtained as
$ git diff HEAD^ HEAD|sed -n '555,577p' >_gitdiff
$ git show HEAD^:zeromass/zeromass.tex > old
$ git show HEAD:zeromass/zeromass.tex > new
$diff -u old new |sed -n '535,555p' >_diff-u
#sorry I cannot show the whole files
$git show HEAD^:zeromass/zeromass.tex|sed -n '3715,3760p' >_old
$git show HEAD:zeromass/zeromass.tex|sed -n '3715,3760p' >_new
Thanks for your attention.
Ric
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (900, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.1.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git depends on:
ii git-man 1:1.7.7.3-1
ii libc6 2.13-24
ii libcurl3-gnutls 7.23.1-3
ii liberror-perl 0.17-1
ii libexpat1 2.0.1-7.2
ii perl-modules 5.14.2-6
ii zlib1g 1:1.2.3.4.dfsg-3
Versions of packages git recommends:
ii less 444-1
ii openssh-client [ssh-client] 1:5.9p1-2
ii patch 2.6.1-2
ii rsync 3.0.9-1
Versions of packages git suggests:
pn git-arch <none>
pn git-cvs <none>
pn git-daemon-run | git-daemon-sysvinit <none>
pn git-doc <none>
pn git-el <none>
pn git-email <none>
pn git-gui <none>
pn git-svn <none>
pn gitk <none>
pn gitweb <none>
-- no debconf information
-&\le
+&\stackrel{\phantom{\normw{\miw}>0}}{\le}
\polyPZ_{4,\NL,0}
\bigglrp{
\logp{
@@ -3713,9 +3737,7 @@ $\polyPZ_{4,\NL,\normw{\miw}}$, such that,
for any
$
\lrp{\Lambda_0,\Lambda,p_\rng{3},\mu}$ in
-$\LazLaPMu{3}$.
-(In the first inequality, $\normw{\miw}>0$.)
-The degrees of the polynomials satisfy:
+$\LazLaPMu{3}$, where
\begin{flalign}
\deg\polyPZ_{4,\NL,\normw{\miw}}
\le
@@ -3732,106 +3754,85 @@ The degrees of the polynomials satisfy:
\label{L.bd.degP.4}
\end{flalign}
}
-The proof of the equivalence goes as follows.
+\textbf{Proof of the equivalence between
+\eqref{L.bd}, \eqref{L.bd.degP} and
@@ -3713,9 +3737,7 @@
for any
$
\lrp{\Lambda_0,\Lambda,p_\rng{3},\mu}$ in
-$\LazLaPMu{3}$.
-(In the first inequality, $\normw{\miw}>0$.)
-The degrees of the polynomials satisfy:
+$\LazLaPMu{3}$, where
\begin{flalign}
\deg\polyPZ_{4,\NL,\normw{\miw}}
\le
@@ -3732,106 +3754,85 @@
\label{L.bd.degP.4}
\end{flalign}
}
-The proof of the equivalence goes as follows.
+\textbf{Proof of the equivalence between
+\eqref{L.bd}, \eqref{L.bd.degP} and
+\eqref{L.bd.4}, \eqref{L.bd.degP.4}.}
Fix $\NL\in\NonNegIntegers$.
-Prove first that~\eqref{L.bd.4}
\lrp{\Lambda_0,\Lambda,p_\rng{3},\mu}$ in
$\LazLaPMu{3}$.
(In the first inequality, $\normw{\miw}>0$.)
The degrees of the polynomials satisfy:
\begin{flalign}
\deg\polyPZ_{4,\NL,\normw{\miw}}
\le
\begin{cases}
\NL
&
\mathrm{if} \; \normw{\miw}=0
\\
\NL-1
&
\mathrm{if} \; \normw{\miw}>0
..
\end{cases}
\label{L.bd.degP.4}
\end{flalign}
}
The proof of the equivalence goes as follows.
Fix $\NL\in\NonNegIntegers$.
Prove first that~\eqref{L.bd.4}
and~\eqref{L.bd.degP.4}
follow from \eqref{L.bd} and \eqref{L.bd.degP}.
Due to the sum rule~\eqref{wrho.sum},
when $\NE=4$, $\Wtrees_{4,2\NL,\rw{\miw}}$
contains only weighted trees having internal lines with
vanishing $\wrho$.
The rules \eqref{ws.sum} and \eqref{ws.theta} imply
furthermore that, when $\NE=4$ and $\normw{\miw}=0$,
the set $\Wtrees_{4,2\NL,0}$
contains only the trivial (minimal) weighted tree
$T_{4,0}:=\lrp{\tree_{4,0},\wrho=0,\wsigma=0}$,
with
\begin{flalign}
\tree_{4,0}:=
\begin{minipage}[c]{0.16\linewidth}\centering %keep
\includegraphics[height=0.08\textheight]{./zm-figs/fig_Wtrees_N4_w0.eps}.
\end{minipage}
\label{Nw=40T}
\end{flalign}
Hence, the sum over weighted trees
in ~\eqref{L.bd.degP.4}
contains only one term,
corresponding to $T_{4,0}$.
\logp{
\frac{\slrv{p_\rng{3}}_\mu}
{\kappa\slrp{\Lambda,p_\rng{3},\mu}}}
,\logp{\frac{\Lambda}{\mu}}
}
&&
\nonumber
\\
\biglrv{
\LP_{4,\NL}^{\sssty\Lambda,\Lambda_0}
\slrp{p_\rng{3};\mu} }
&\stackrel{\phantom{\normw{\miw}>0}}{\le}
\polyPZ_{4,\NL,0}
\bigglrp{
\logp{
\frac{\slrv{p_\rng{3}}_\mu}
{\kappa\slrp{\Lambda,p_\rng{3},\mu}}}
,\logp{\frac{\Lambda}{\mu}}
},
&&
\label{L.bd.4}
\end{align}
for any
$
\lrp{\Lambda_0,\Lambda,p_\rng{3},\mu}$ in
$\LazLaPMu{3}$, where
\begin{flalign}
\deg\polyPZ_{4,\NL,\normw{\miw}}
\le
\begin{cases}
\NL
&
\mathrm{if} \; \normw{\miw}=0
\\
\NL-1
&
\mathrm{if} \; \normw{\miw}>0
..
\end{cases}
\label{L.bd.degP.4}
\end{flalign}
}
\textbf{Proof of the equivalence between
\eqref{L.bd}, \eqref{L.bd.degP} and
\eqref{L.bd.4}, \eqref{L.bd.degP.4}.}
Fix $\NL\in\NonNegIntegers$.
