23 May
2005
23 May
'05
11:18 p.m.
On 5/23/05, Vincent Massol <vincent(a)massol.net> wrote:
I had removed these lines and it seems you've added them again. Is it a
mistake?
I'm curious to find out what is wrong in our SVN. Normally this should have
been managed properly by your SVN client.
Hi Vincent,
Wow, I'm sorry about that ! I did an update before comitting and
dealt with a conflict I had in the build.xml file, but it wasn't in
that place in the file. Actually it was kind of weird, it seemed to
me that SVN should have been able to work things out by itself. But I
didn't see anything concerning those lines. At one point, it seemed
my client (subeclipse) was having trouble because it kept pointing out
the same conflict even though I had edited the file and resolved it.
Maybe I missed something.
I removed the lines again.
--
Luis Arias
http://www.xwiki.com
http://www.innover-entreprendre.net
+33 6 14 20 87 93 mobile