I'm running 1.9.1 and just failed to commit a change - that is not a
problem, somebody else updated the Changelog, causing a conflict.
But svn now gave error messages, and after I had run 'svn up' it no
longer seems to offer a 'mine first' option (for the Changelog, that
is normally what I want), only a 'mine' or 'theirs' or 'edit'.  And
after I made the edit and marked it as resolved, a filename.edited
file was left hanging around.

Yeughh!

ĸen
-- 
Il Porcupino Nil Sodomy Est! (if you will excuse my latatian)
  aka "The hedgehog song"
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to