The first stage of merging mpir-exp back into trunk is to "bring your
branch in sync with the trunk again, just as you've been doing all
along".
[wbhart@eno mpir-exp]$ svn merge --dry-run ^/mpir/trunk
--- Merging r3747 through r3925 into '.':
U Makefile.in
U cpuid.c
C new_fft_with_flint.c
C new_fft.c
C mpn/x86_64w/bobcat/redc_1.asm
C mpn/x86_64w/bobcat/mul_1.asm
C mpn/x86_64w/bobcat/mul_basecase.asm
C mpn/x86_64w/bobcat/sqr_basecase.asm
C mpn/x86_64w/sandybridge/redc_1.asm
C mpn/x86_64w/sandybridge/mul_1.asm
C mpn/x86_64w/sandybridge/mul_basecase.asm
C mpn/x86_64w/sandybridge/sqr_basecase.asm
C mpn/x86_64w/atom/mul_1.asm
C mpn/x86_64w/atom/mul_basecase.asm
C mpn/x86_64w/atom/sqr_basecase.asm
C mpn/x86_64w/netburst/mul_1.asm
C mpn/x86_64w/netburst/mul_basecase.asm
C mpn/x86_64w/netburst/sqr_basecase.asm
U mpn/x86_64w/fat/fat_entry.asm
U mpn/powerpc64/gmp-mparam.h
U mpn/x86_64/k8/karasub.asm
U mpn/x86_64/k8/k10/karasub.asm
U mpn/x86_64/bobcat/karasub.asm
A mpn/x86_64/bobcat/
redc_1.as
U mpn/x86_64/sandybridge/karasub.asm
A mpn/x86_64/sandybridge/
redc_1.as
U mpn/x86_64/atom/karasub.asm
U mpn/x86_64/netburst/karasub.asm
U mpn/x86_64/nehalem/karasub.asm
U mpn/x86_64/core2/karasub.asm
C mpn/generic/subadd_n.c
C mpn/generic/redc_2.c
C mpn/generic/addadd_n.c
U mpn/generic/hgcd.c
C mpn/generic/sumdiff_n.c
C mpn/generic/addsub_n.c
U mpn/generic/gcdext_subdiv_step.c
C mpn/x86w/p3/cfg.h
C mpn/x86w/p4/cfg.h
U mpn/asm-defs.m4
U devel/setversion
U doc/mpir.info-1
U doc/mpir.texi
U doc/mpir.info-2
U doc/
mpir.info
U doc/stamp-vti
U doc/version.texi
U
config.in
U NEWS
U
configure.in
C build.vc10/mpir_config.py
C build.vc10/lib_mpir_nehalem/lib_mpir_nehalem.vcxproj
C build.vc10/lib_mpir_nehalem/lib_mpir_nehalem.vcxproj.filters
C build.vc10/lib
C build.vc10/dll
C build.vc10/dll_mpir_nehalem/dll_mpir_nehalem.vcxproj
C build.vc10/dll_mpir_nehalem/dll_mpir_nehalem.vcxproj.filters
C build.vc10/lib_mpir_p0/lib_mpir_p0.vcxproj
C build.vc10/lib_mpir_p0/lib_mpir_p0.vcxproj.filters
C build.vc10/lib_mpir_p3/lib_mpir_p3.vcxproj.filters
C build.vc10/lib_mpir_p3/lib_mpir_p3.vcxproj
C build.vc10/lib_mpir_p4/lib_mpir_p4.vcxproj.filters
C build.vc10/lib_mpir_p4/lib_mpir_p4.vcxproj
U build.vc10/mpir-tests.sln
C build.vc10/dll_mpir_k8/dll_mpir_k8.vcxproj.filters
C build.vc10/dll_mpir_k8/dll_mpir_k8.vcxproj
C build.vc10/lib_mpir_gc/lib_mpir_gc.vcxproj
C build.vc10/lib_mpir_gc/lib_mpir_gc.vcxproj.filters
C build.vc10/lib_mpir_cxx/lib_mpir_cxx.vcxproj
C build.vc10/lib_mpir_core2/lib_mpir_core2.vcxproj
C build.vc10/lib_mpir_core2/lib_mpir_core2.vcxproj.filters
C build.vc10/dll_mpir_core2/dll_mpir_core2.vcxproj
C build.vc10/dll_mpir_core2/dll_mpir_core2.vcxproj.filters
C build.vc10/lib_mpir_k8/lib_mpir_k8.vcxproj.filters
C build.vc10/lib_mpir_k8/lib_mpir_k8.vcxproj
C build.vc10/dll_mpir_p0/dll_mpir_p0.vcxproj.filters
C build.vc10/dll_mpir_p0/dll_mpir_p0.vcxproj
C build.vc10/dll_mpir_p3/dll_mpir_p3.vcxproj.filters
C build.vc10/dll_mpir_p3/dll_mpir_p3.vcxproj
C build.vc10/dll_mpir_p4/dll_mpir_p4.vcxproj
C build.vc10/dll_mpir_p4/dll_mpir_p4.vcxproj.filters
C build.vc10/lib_mpir_k10/lib_mpir_k10.vcxproj
U build.vc10/lib_mpir_k10/lib_mpir_k10.vcxproj.filters
C build.vc10/dll_mpir_gc/dll_mpir_gc.vcxproj
C build.vc10/dll_mpir_gc/dll_mpir_gc.vcxproj.filters
C build.vc10/dll_mpir_k10/dll_mpir_k10.vcxproj
U build.vc10/dll_mpir_k10/dll_mpir_k10.vcxproj.filters
U configure
U tests/mpn/t-addadd_n.c
U tests/mpn/t-addsub_n.c
U tests/mpn/t-subadd_n.c
U tests/devel/try.c
U
gmp-h.in
U acinclude.m4
U Makefile.am
Summary of conflicts:
Text conflicts: 47
Tree conflicts: 10
Ouch, what a mess! It looks like many changes have been made to trunk
without ever merging them into mpir-exp.
The second step will be the reintegration merge of mpir-exp back into
trunk. I daren't even do a dry-run of that until we pluck up the
courage to bring mpir-exp up-to-date!
Bill.