how to compare branches?

[Steve Kargl]

It has been brought to my attention that a few fixes to libm
in main have not been merged to at least the 13 branch. To
check on the level of missing changes, I would to compare ther
lib/msun on main to lib/msun on stable/13. What is the git
command needed for such a task? My attempts of modifying results
from a google search of "git diff between branches" has been
entertaining but fruitless.

[Brooks Davis]

Post by Steve Kargl
It has been brought to my attention that a few fixes to libm
in main have not been merged to at least the 13 branch. To
check on the level of missing changes, I would to compare ther
lib/msun on main to lib/msun on stable/13. What is the git
command needed for such a task? My attempts of modifying results
from a google search of "git diff between branches" has been
entertaining but fruitless.

git diff stable/13..main lib/msun

or you can see individual commits graphically on mfc.freebsd.org with
the filter @lib/msun/

-- Brooks


--
Posted automagically by a mail2news gateway at muc.de e.V.
Please direct questions, flames, donations, etc. to news-***@muc.de

[Ed Maste]

Post by Brooks Davis
or you can see individual commits graphically on mfc.freebsd.org with

We also have a tool in the base system which will list the unmerged commits:

% sh tools/tools/git/mfc-candidates.sh -a lib/msun
34cc08e33698 Save all fpcr/fpsr bits in the AArch64 fenv_t
7702d940ec9a Avoid -pedantic warnings about using _Generic in __fp_type_select
2b9a828c9949 Set default SPE FP environment
292815eac623 Fix powf().
3550a49f6814 msun: Add copyright notices
455b2ccda3df * lib/msun/Makefile: . Disconnect b_exp.c and b_log.c
from the build.
03a88e3de9c6 * lib/msun/Makefile b/lib/msun/Makefile: . Disconnect
imprecise.c from the build. This file can be deleted. . Add
b_tgammal.c to the build for ld80 and ld128 targets. The ld128 is
a 'git mv' of imprecise.c to ld128/b_tgammal.c.
b94b8bf7027e mips: Remove msun support
56f5947a7102 Remove checks for __GNUCLIKE_ASM assuming it is always true.
c44ca4c227f7 msun/Makefile: Fix conditional and unbreak the build.
Approved by:imp Fixes: 20adba8bc1beb125d5e5ed8f12e747ae79ca6a10
ae902a5be9b8 libc: Simplify soft-float on 32-bit arm
4d846d260e2b spdx: The BSD-2-Clause-FreeBSD identifier is obsolete,
drop -FreeBSD

Should all of these be merged to stable/13?


--
Posted automagically by a mail2news gateway at muc.de e.V.
Please direct questions, flames, donations, etc. to news-***@muc.de

[Steve Kargl]

Post by Ed Maste

Post by Brooks Davis
or you can see individual commits graphically on mfc.freebsd.org with

% sh tools/tools/git/mfc-candidates.sh -a lib/msun
34cc08e33698 Save all fpcr/fpsr bits in the AArch64 fenv_t
7702d940ec9a Avoid -pedantic warnings about using _Generic in __fp_type_select
2b9a828c9949 Set default SPE FP environment
292815eac623 Fix powf().

This ...

Post by Ed Maste
3550a49f6814 msun: Add copyright notices
455b2ccda3df * lib/msun/Makefile: . Disconnect b_exp.c and b_log.c

This ...

Post by Ed Maste
from the build.
03a88e3de9c6 * lib/msun/Makefile b/lib/msun/Makefile: . Disconnect
imprecise.c from the build. This file can be deleted. . Add
b_tgammal.c to the build for ld80 and ld128 targets. The ld128 is
a 'git mv' of imprecise.c to ld128/b_tgammal.c.

This ...

Post by Ed Maste
b94b8bf7027e mips: Remove msun support
56f5947a7102 Remove checks for __GNUCLIKE_ASM assuming it is always true.
c44ca4c227f7 msun/Makefile: Fix conditional and unbreak the build.
Approved by:imp Fixes: 20adba8bc1beb125d5e5ed8f12e747ae79ca6a10
ae902a5be9b8 libc: Simplify soft-float on 32-bit arm
4d846d260e2b spdx: The BSD-2-Clause-FreeBSD identifier is obsolete,
drop -FreeBSD
Should all of these be merged to stable/13?

fix bugs or provide missing implementations of math functions. The
other patches either touch target-specific code (arm, aarch64) that
I don't have and can't easily test or are cosmetic (e.g., BSD 2-Clause).
I haven't seen any new libm bug reports, so likely all of the above
can be merge.

Note, Paul Zimmermann (a MPFR developer) that FreeBSD is only OS
that he's aware that supplies sinpi, cospi, and tanpi functions.
While testing, he found a few issues with these, reported them
to me, and I have a patch under going test. I'll submit it
shortly.

te

[Warner Losh]

Post by Ed Maste

Post by Ed Maste

Post by Brooks Davis
or you can see individual commits graphically on mfc.freebsd.org with

We also have a tool in the base system which will list the unmerged
% sh tools/tools/git/mfc-candidates.sh -a lib/msun
34cc08e33698 Save all fpcr/fpsr bits in the AArch64 fenv_t
7702d940ec9a Avoid -pedantic warnings about using _Generic in

__fp_type_select

Post by Ed Maste
2b9a828c9949 Set default SPE FP environment
292815eac623 Fix powf().

This ...

Post by Ed Maste
3550a49f6814 msun: Add copyright notices
455b2ccda3df * lib/msun/Makefile: . Disconnect b_exp.c and b_log.c

This ...

Post by Ed Maste
from the build.
03a88e3de9c6 * lib/msun/Makefile b/lib/msun/Makefile: . Disconnect
imprecise.c from the build. This file can be deleted. . Add
b_tgammal.c to the build for ld80 and ld128 targets. The ld128 is
a 'git mv' of imprecise.c to ld128/b_tgammal.c.

This ...

Post by Ed Maste
b94b8bf7027e mips: Remove msun support
56f5947a7102 Remove checks for __GNUCLIKE_ASM assuming it is always true.
c44ca4c227f7 msun/Makefile: Fix conditional and unbreak the build.
Approved by:imp Fixes: 20adba8bc1beb125d5e5ed8f12e747ae79ca6a10
ae902a5be9b8 libc: Simplify soft-float on 32-bit arm
4d846d260e2b spdx: The BSD-2-Clause-FreeBSD identifier is obsolete,
drop -FreeBSD

I'm merging this tomorrow or Wednesday.

Post by Ed Maste
Should all of these be merged to stable/13?
fix bugs or provide missing implementations of math functions. The
other patches either touch target-specific code (arm, aarch64) that
I don't have and can't easily test or are cosmetic (e.g., BSD 2-Clause).
I haven't seen any new libm bug reports, so likely all of the above
can be merge.

Ignore the bsd 2 clause stuff. Life got too busy for me....

Warner

Note, Paul Zimmermann (a MPFR developer) that FreeBSD is only OS

Post by Ed Maste
that he's aware that supplies sinpi, cospi, and tanpi functions.
While testing, he found a few issues with these, reported them
to me, and I have a patch under going test. I'll submit it
shortly.
te
--
Steve

[Steve Kargl]

Post by Brooks Davis

Post by Steve Kargl
It has been brought to my attention that a few fixes to libm
in main have not been merged to at least the 13 branch. To
check on the level of missing changes, I would to compare ther
lib/msun on main to lib/msun on stable/13. What is the git
command needed for such a task? My attempts of modifying results
from a google search of "git diff between branches" has been
entertaining but fruitless.

git diff stable/13..main lib/msun
or you can see individual commits graphically on mfc.freebsd.org with

Thanks! The command you showed is the one variation I didn't try.
Hmmm, I must be missing something.

% cd /usr/src
% git diff stable/13..main lib/msun
fatal: ambiguous argument 'stable/13..main': unknown revision or path
not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
% git status
On branch main
Your branch is up to date with 'freebsd/main'

[Steve Kargl]

Post by Steve Kargl

Post by Brooks Davis

Post by Steve Kargl
It has been brought to my attention that a few fixes to libm
in main have not been merged to at least the 13 branch. To
check on the level of missing changes, I would to compare ther
lib/msun on main to lib/msun on stable/13. What is the git
command needed for such a task? My attempts of modifying results
from a google search of "git diff between branches" has been
entertaining but fruitless.

git diff stable/13..main lib/msun
or you can see individual commits graphically on mfc.freebsd.org with

Thanks! The command you showed is the one variation I didn't try.
Hmmm, I must be missing something.
% cd /usr/src
% git diff stable/13..main lib/msun
fatal: ambiguous argument 'stable/13..main': unknown revision or path
not in the working tree.
'git <command> [<revision>...] -- [<file>...]'
% git status
On branch main
Your branch is up to date with 'freebsd/main'

So, it seems I used the info from
https://docs.freebsd.org/en/books/handbook/mirrors/#git
to clone freebsd. I need to include the freebsd/ in the
command.

This works

% git diff freebsd/stable/13..freebsd/main -- lib/msun

[Steve Kargl]

Post by Brooks Davis
or you can see individual commits graphically on mfc.freebsd.org with

Ed, Warner,

Thanks for the merges!