Eric and I had problems with merging the trunk into branches. We get inexplicable conflicts in files that were never touched on the branch. I found a CVS bug report that describes more or less the problem we're seeing:
http://www.geocrawler.com/archives/3/383/1999/8/50/2524697/ It's quite old and I didn't find any reply to it. :( It describes a workaround, though. And it seems only remote access through ssh is affected. Would it be ok to do the merge with my ssh account on dri.freedesktop.org? That would give me local CVS access and would speed things up a lot compared to merging through a modem. Regards, Felix ------------ __\|/__ ___ ___ ------------------------- Felix ___\_e -_/___/ __\___/ __\_____ You can do anything, Kühling (_____\Ä/____/ /_____/ /________) just not everything [EMAIL PROTECTED] \___/ \___/ U at the same time. ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
