Date: Sun, 2 Jun 2019 19:06:42 +0200 From: Kurt Jaeger <pi@freebsd.org> To: ports@freebsd.org Subject: svn usage question for moved/changed files Message-ID: <20190602170642.GB5902@home.opsec.eu>
next in thread | raw e-mail | index | archive | help
Hi! I've prepared a patch for net-mgmt/net-snmp, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232025 The problem: svn diff does not generate a patch that works on a clean repo checkout. The diff https://bugs.freebsd.org/bugzilla/attachment.cgi?id=202692 was created using 'svn diff'. Applying this patch on a new repo with 'svn patch' fails. Why is that ? What parameters do I have to use so that the patch applies cleanly ? If I use svn diff --show-copies-as-adds it looks ok, but is the svn mv of some files done in the correct way in that case ? In my svn repo, svn status says this: M Makefile M distinfo M files/extra-patch-local_Makefile.in MM files/patch-Makefile.in A + files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c > moved from files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c D files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c > moved to files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c D files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c M files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c D files/patch-agent_mibgroup_mibII_icmp.h A + files/patch-agent_mibgroup_mibII_tcpTable.c > moved from files/patch-tcpTable.c A + files/patch-agent_mibgroup_mibII_udpTable.c > moved from files/patch-udpTable.c M files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c D files/patch-agent_mibgroup_ucd-snmp_diskio.c M files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c D files/patch-include__net-snmp__net-snmp-config.h.in A + files/patch-include_net-snmp_library_transform__oids.h > moved from files/patch-transform_oids.h M files/patch-include_net-snmp_system_freebsd13.h D files/patch-kthreads D files/patch-perl5.23 D files/patch-snmplib_snmp__api.c A + files/patch-snmplib_snmpusm.c > moved from files/patch-snmpusm.c D files/patch-snmpusm.c > moved to files/patch-snmplib_snmpusm.c D files/patch-tcpTable.c > moved to files/patch-agent_mibgroup_mibII_tcpTable.c D files/patch-transform_oids.h > moved to files/patch-include_net-snmp_library_transform__oids.h D files/patch-udpTable.c > moved to files/patch-agent_mibgroup_mibII_udpTable.c M pkg-plist -- pi@FreeBSD.org +49 171 3101372 One year to go !
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190602170642.GB5902>