Package: subversion
Version: 1.6.17dfsg-1
Severity: normal
Hello,
Something is going terribly wrong in the current version of Subversion when
resolving conflicts by means of an external merge tool.
I'm running kdiff3 as an eternal merge tool by using the SVN_MERGE environment
variable pointing to a basic script invoking kdiff3 (see bottom).
Whenever a conflict is found:
- press 'l' to launch kdiff3
- solve the problem and save "out"-file in kdiff3, returning "0" for success
- press 'r' for resolving the conflict
However, at the end of the merge, Subversion starts all over, offering the same
conflicting files again, over and over. I assume somehow the files aren't
really marked as resolved, or lingering *.tmp files confuse Subversion.
Either way, merging with version 1.6.17 by using an external tool doesn't work
as it should, as either the conflicting files or the internal state are not
correctly updated.
Note that this is not a kdiff3 bug, as I double-checked the paths every time
and it correctly merges and saves the files to the paths given by Subversion. I
also checked the 1.6.17 source for the arguments given to the external merge
tool, and no problems there.
Thanks for your time,
Wouter
PS: simple invocation script for external merge tool:
#!/bin/sh
echo "DEBUG: $*" >> $HOME/kdiff3.log
# base theirs mine merged wcpath
#kdiff3 "$1" "$2" "$3" -o "$4"
kdiff3 "$1" "$2" "$3" -o "$4" --L1 current-original --L2 new --L3 current-ours
1>&2
if [ $? -eq 0 ]; then
exit 0
else
exit 1
fi
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.39-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=nl_BE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages subversion depends on:
ii libapr1 1.4.5-1
ii libc6 2.13-21
ii libsasl2-2 2.1.24~rc1.dfsg1+cvs2011-05-23-6
ii libsvn1 1.6.17dfsg-1
subversion recommends no packages.
Versions of packages subversion suggests:
pn db4.8-util <none>
pn patch 2.6.1-2
pn subversion-tools <none>
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
