Your message dated Fri, 16 Nov 2007 11:03:58 -0600
with message-id <[EMAIL PROTECTED]>
and subject line Bug#451503: subversion: Incorrect mentioning of conflicts
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
>> Does it help to use 'svn merge -x-b' or 'svn merge -x-w'?
[Ron Rademaker]
> Of course that helps ;)
Great - I'm closing the bug, then.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
--- End Message ---
