Package: subversion
Version: 1.4.4dfsg1-1
Severity: minor

After a merge I often find these kinds of conflicts in a file:

<<<<<<< .working

=======

>>>>>>> .merge-right.r15781

Obviously, both are empty lines and there's no need to create a conflict
over this. I don't know how svn compares but I think adding a simple
regex check like /^\w*$/ would solve this.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-3-k7 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages subversion depends on:
ii  libapr1                     1.2.11-1     The Apache Portable Runtime Librar
ii  libc6                       2.6.1-6      GNU C Library: Shared libraries
ii  libsvn1                     1.4.4dfsg1-1 Shared libraries used by Subversio

subversion recommends no packages.

-- no debconf information



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to