[Bug 286291] Re: conflict resolution fails due to old version of psvn.el

[Maarten Bezemer]

Thank you for taking the time to report this bug and helping to make
Ubuntu better. We are sorry that we do not always have the capacity to
look at all reported bugs in a timely manner. There have been many
changes in Ubuntu since that time you reported the bug and your problem
may have been fixed with some of the updates. It would help us a lot if
you could test it on a currently supported Ubuntu version. When you test
it and it is still an issue, kindly upload the updated logs by running
apport-collect 286291 and any other logs that are relevant for this
particular issue.

** Changed in: subversion (Ubuntu)
       Status: New => Incomplete

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to subversion in Ubuntu.
https://bugs.launchpad.net/bugs/286291

Title:
  conflict resolution fails due to old version of psvn.el

Status in “subversion” package in Ubuntu:
  Incomplete

Bug description:
  Binary package hint: subversion

  The psvn.el version included in the subversion package  1.4.6dfsg1-2ubuntu1 is too old to work with the subversion (1.4.6).
  Trying to use "diff > resolve conflicts" results in the wrong error "No conflict Markers found".

  The new version of psvn.el available at
  http://www.xsteve.at/prg/emacs/psvn.el works properly.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/subversion/+bug/286291/+subscriptions