On Jan 09 13:41:07, h...@stare.cz wrote:
> The current ports.tar.gz contains files that 'cvs up'
> considers to be in conflict. For example, untaring
> snapshots/ports.tar.gz and running
>
> cvs -q -d anon...@mirror.osn.de:/cvs up -PdA
>
> on to of that gives
>
> C x11/paper-icon-theme/distinfo
> cvs update: move away x11/paper-icon-theme/pkg/DESCR; it is in the way
>
> and many others (full list below).
>
> I am not sure _where_ the problem is: the tarball,
> my cvs workdir (freshly untarred), the command,
> the particular mirror?
I'm looking at www/sass/Makefile as an example.
The file contains no conflict markers (<< >>).
I copied the Makefile to /tmp, did a cvs up -PdA
in the sass directory: this didn't report anything
or changed anyting.
Another cvs up -PdA of the whole ports tree still reports
C www/sass/Makefile
C www/sass/distinfo
C www/sass/pkg/DESCR
C www/sass/pkg/PLIST
as conflicting.
Removing the sass directory and doing another cvs up -PdA
checks the sass directory out afresh, containing the same
copy of the Makefile again.
Is it the sass/ directory itself that is in conflict?
(With what?)
Jan
> C devel/p5-Devel-CheckOS/Makefile
> C devel/p5-Devel-CheckOS/distinfo
> C devel/p5-Devel-CheckOS/pkg/DESCR
> C devel/p5-Devel-CheckOS/pkg/PLIST
> C devel/p5-Log-Any-Adapter-Callback/Makefile
> C devel/p5-Log-Any-Adapter-Callback/distinfo
> C devel/p5-Log-Any-Adapter-Callback/pkg/DESCR
> C devel/p5-Log-Any-Adapter-Callback/pkg/PLIST
> C devel/p5-Test-Needs/Makefile
> C devel/p5-Test-Needs/distinfo
> C devel/p5-Test-Needs/pkg/DESCR
> C devel/p5-Test-Needs/pkg/PLIST
> C devel/premake4/Makefile
> C devel/premake4/distinfo
> C devel/premake4/files/scripts.c
> C devel/premake4/patches/patch-build_gmake_unix_Premake4_make
> C devel/premake4/patches/patch-src_base_os_lua
> C devel/premake4/patches/patch-src_host_os_getversion_c
> C devel/premake4/pkg/DESCR
> C devel/premake4/pkg/PLIST
> C devel/py-backports-functools-lru-cache/Makefile
> C devel/py-backports-functools-lru-cache/distinfo
> C devel/py-backports-functools-lru-cache/pkg/DESCR
> C devel/py-backports-functools-lru-cache/pkg/PLIST
> C devel/py-codestyle/Makefile
> C devel/py-codestyle/distinfo
> C devel/py-codestyle/pkg/DESCR
> C devel/py-codestyle/pkg/PLIST
> C devel/py-construct/Makefile
> C devel/py-construct/distinfo
> C devel/py-construct/pkg/DESCR
> C devel/py-construct/pkg/PLIST
> C devel/py-efilter/Makefile
> C devel/py-efilter/distinfo
> C devel/py-efilter/pkg/DESCR
> C devel/py-efilter/pkg/PLIST
> C devel/py-entrypoints/Makefile
> C devel/py-entrypoints/distinfo
> C devel/py-entrypoints/pkg/DESCR
> C devel/py-entrypoints/pkg/PLIST
> C devel/py-execnet/Makefile
> C devel/py-execnet/distinfo
> C devel/py-execnet/pkg/DESCR
> C devel/py-execnet/pkg/PLIST
> C devel/py-hypothesis/Makefile
> C devel/py-hypothesis/distinfo
> C devel/py-hypothesis/pkg/DESCR
> C devel/py-hypothesis/pkg/PLIST
> C devel/py-isort/Makefile
> C devel/py-isort/distinfo
> C devel/py-isort/pkg/DESCR
> C devel/py-isort/pkg/PLIST
> C devel/py-ply/Makefile
> C devel/py-ply/distinfo
> C devel/py-ply/pkg/DESCR
> C devel/py-ply/pkg/PLIST
> C devel/py-robotframework/Makefile
> C devel/py-robotframework/distinfo
> C devel/py-robotframework/pkg/DESCR
> C devel/py-robotframework/pkg/PLIST
> C devel/py-spark-parser/Makefile
> C devel/py-spark-parser/distinfo
> C devel/py-spark-parser/pkg/DESCR
> C devel/py-spark-parser/pkg/PLIST
> C devel/py-test-xdist/Makefile
> C devel/py-test-xdist/distinfo
> C devel/py-test-xdist/patches/patch-testing_acceptance_test_py
> C devel/py-test-xdist/pkg/DESCR
> C devel/py-test-xdist/pkg/PLIST
> C devel/py-uncompyle6/Makefile
> C devel/py-uncompyle6/distinfo
> C devel/py-uncompyle6/pkg/DESCR
> C devel/py-uncompyle6/pkg/PLIST
> C devel/py-voluptuous/Makefile
> C devel/py-voluptuous/distinfo
> C devel/py-voluptuous/pkg/DESCR
> C devel/py-voluptuous/pkg/PLIST
> C devel/py-xdis/Makefile
> C devel/py-xdis/distinfo
> C devel/py-xdis/pkg/DESCR
> C devel/py-xdis/pkg/PLIST
> C devel/ruby-fast_gettext/Makefile
> C devel/ruby-fast_gettext/distinfo
> C devel/ruby-fast_gettext/pkg/DESCR
> C devel/ruby-fast_gettext/pkg/PLIST
> C devel/ruby-gettext-setup/Makefile
> C devel/ruby-gettext-setup/distinfo
> C devel/ruby-gettext-setup/pkg/DESCR
> C devel/ruby-gettext-setup/pkg/PLIST
> C textproc/py-demjson/Makefile
> C textproc/py-demjson/distinfo
> C textproc/py-demjson/patches/patch-setup_py
> C textproc/py-demjson/pkg/DESCR
> C textproc/py-demjson/pkg/PLIST
> C www/py-waitress/Makefile
> C www/py-waitress/distinfo
> C www/py-waitress/patches/patch-setup_cfg
> C www/py-waitress/pkg/DESCR
> C www/py-waitress/pkg/PLIST
> C www/sass/Makefile
> C www/sass/distinfo
> C www/sass/pkg/DESCR
> C www/sass/pkg/PLIST
> C www/tor-browser/Makefile
> C www/tor-browser/Makefile.inc
> C www/tor-browser/browser/Makefile
> C www/tor-browser/browser/distinfo
> C www/tor-browser/browser/files/all-openbsd.js
> C www/tor-browser/browser/files/bookmarks.html
> C www/tor-browser/browser/files/configure
> C www/tor-browser/browser/files/pledge.content
> C www/tor-browser/browser/files/pledge.gpu
> C www/tor-browser/browser/files/pledge.main
> C www/tor-browser/browser/files/tor-browser
> C www/tor-browser/browser/files/tor-browser.cfg
> C www/tor-browser/browser/files/tor-browser.desktop
> C www/tor-browser/browser/files/torrc-defaults
> C www/tor-browser/browser/files/unveil.content
> C www/tor-browser/browser/files/unveil.gpu
> C www/tor-browser/browser/files/unveil.main
> C www/tor-browser/browser/patches/patch-_mozconfig
> C
> www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js
> C
> www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js
> C
> www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm
> C www/tor-browser/browser/patches/patch-config_makefiles_rust_mk
> C www/tor-browser/browser/patches/patch-dom_ipc_ContentChild_cpp
> C www/tor-browser/browser/patches/patch-dom_webgpu_ipc_WebGPUParent_cpp
> C www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in
> C www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h
> C www/tor-browser/browser/patches/patch-media_libcubeb_src_cubeb_sndio_c
> C www/tor-browser/browser/patches/patch-security_nss_Makefile
> C www/tor-browser/browser/patches/patch-security_nss_coreconf_OpenBSD_mk
> C www/tor-browser/browser/patches/patch-security_nss_coreconf_UNIX_mk
> C www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h
> C www/tor-browser/browser/patches/patch-toolkit_moz_configure
> C www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp
> C
> www/tor-browser/browser/patches/patch-tor-browser_en-US_Browser_TorBrowser_Data_fontconfig_fonts_conf
> C www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp
> C www/tor-browser/browser/pkg/DESCR
> C www/tor-browser/browser/pkg/PLIST
> C www/tor-browser/noscript/Makefile
> C www/tor-browser/noscript/distinfo
> C www/tor-browser/noscript/pkg/DESCR
> C www/tor-browser/noscript/pkg/PLIST
> C x11/paper-gtk-theme/Makefile
> C x11/paper-gtk-theme/distinfo
> C x11/paper-gtk-theme/patches/patch-Add_GTK-3.22_theme
> C x11/paper-gtk-theme/pkg/DESCR
> C x11/paper-gtk-theme/pkg/PLIST
> C x11/paper-icon-theme/Makefile
> C x11/paper-icon-theme/distinfo
> C x11/paper-icon-theme/pkg/DESCR
> C x11/paper-icon-theme/pkg/PLIST
> C x11/stumpwm/Makefile
> C x11/stumpwm/distinfo
> C x11/stumpwm/pkg/DESCR
> C x11/stumpwm/pkg/PLIST
>
>
