Hi Ingo, On 2010-06-20 at 11:56:01 [+0200], Ingo Weinhold <ingo_weinhold@xxxxxx> wrote: > On 2010-06-20 at 00:04:25 [+0200], Oliver Tappe <zooey@xxxxxxxxxxxxxxx> wrote: [ ... ] > > I have tried to find out why exactly this happened, but I'm not quite sure. > > It > > certainly looks as if subversion didn't like these order of things: > > > > 1. I created the posix-locale branch > > 2. Ingo deleted posixtestsuite in trunk > > 3. Ingo added (the full) posixtestsuite in trunk > > 4. I tried to merge changes 2 + 3 into posix-locale > > > > I find this "tree conflict" quite scary, especially since I didn't touch > > posixtestsuite at all in my branch. > > Which svn version were you using? 1.6.4 as client, 1.6.11 as server. AFAICS, that combination should be able to handle tree conflicts gracefully, but it just didn't. > Anyway, I still think we should switch to a distributed VCS which do have > less issues with branching and merging, besides other nice features. Yep, so do I. I'm not looking forward to having to merge posix-locale back to trunk one day. cheers, Oliver