Package: subversion
Version: 1.3.1-3
Severity: Cminnormal
The following test case creates a file, copies it, creates another file
with the same name and tries to merge those two files.
During merge, subversion shows this as an added file ('A'), not as a
merge conflict ('C').
$ cat ~/prog/debian/subversion.bug
#!/bin/sh
SVN=$PWD/svn
svnadmin create $SVN
svn mkdir -m mkdir file://$SVN/a
svn cp -m cp file://$SVN/a file://$SVN/b
svn co file://$SVN work
cd work
date > b/bar
svn add b/bar
svn ci -m cib b/bar
date > a/bar
svn add a/bar
svn ci -m cia a/bar
svn merge file://$SVN/[EMAIL PROTECTED] file://$SVN/[EMAIL PROTECTED]
a/
svn status a/bar
$ . ~/prog/debian/subversion.bug
Committed revision 1.
Committed revision 2.
A work/a
A work/b
Checked out revision 2.
A b/bar
Adding b/bar
Transmitting file data .
Committed revision 3.
A a/bar
Adding a/bar
Transmitting file data .
Committed revision 4.
A a/bar
C a/bar
Compare last two lines.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (989, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16.14-walker
Locale: LANG=de_DE.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages subversion depends on:
ii libapr0 2.0.55-4 the Apache Portable Runtime
ii libc6 2.3.6-7 GNU C Library: Shared libraries
ii libsvn0 1.3.1-3 shared libraries used by Subversio
ii patch 2.5.9-4 Apply a diff file to an original
subversion recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
