RE: Assert when Edit Conflict

2011-01-25 Thread Joel Wahlberg
Thank you for the quick answer. I will upgrade as soon as possible. /Joel -Original Message- From: Johan Corveleyn [mailto:jcor...@gmail.com] Sent: den 25 januari 2011 11:51 To: Joel Wahlberg Cc: users@subversion.apache.org Subject: Re: Assert when Edit Conflict Hi Joel, [ In the

Re: Assert when Edit Conflict

2011-01-25 Thread Stefan Sperling
On Tue, Jan 25, 2011 at 10:15:48AM +, Joel Wahlberg wrote: > > I've tried to merge some project files but ended up with: > > [cid:image002.png@01CBBC80.27E388D0] > > Pressing Keep the directory resulted in: > > [cid:image001.png@01CBBC80.27E388D0] The attached image shows the assertion des

Re: Assert when Edit Conflict

2011-01-25 Thread Johan Corveleyn
Hi Joel, [ In the future, could you please type or copy-paste the error message in the body of the mail? Makes it easier to read (and not everybody can open/see inline or attached images), and findable if someone searches the archives. ] For posterity, the error message is: "In file 'D:\Develop