On 2010-06-20 at 00:04:25 [+0200], Oliver Tappe <zooey@xxxxxxxxxxxxxxx> wrote: > On 2010-06-19 at 23:50:18 [+0200], zooey@xxxxxxxxxxxxxxx wrote: > > Author: zooey > > Date: 2010-06-19 23:50:14 +0200 (Sat, 19 Jun 2010) > > New Revision: 37181 > > Changeset: http://dev.haiku-os.org/changeset/37181/haiku > > > > Log: > > * merged changes from trunk (last part, all of this to work around a tree > > conflict reported by subversion) > > 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? Anyway, I still think we should switch to a distributed VCS which do have less issues with branching and merging, besides other nice features. CU, Ingo