From owner-freebsd-hackers@FreeBSD.ORG Sun Nov 4 01:08:28 2012 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1CC34C6E for ; Sun, 4 Nov 2012 01:08:28 +0000 (UTC) (envelope-from tzabal@it.teithe.gr) Received: from alpha.it.teithe.gr (alpha.it.teithe.gr [195.251.240.232]) by mx1.freebsd.org (Postfix) with ESMTP id 84C988FC12 for ; Sun, 4 Nov 2012 01:08:27 +0000 (UTC) Received: from localhost (babel2.noc.teithe.gr [195.251.240.240] (may be forged)) by alpha.it.teithe.gr (8.14.3/8.14.3/Debian-9.4) with ESMTP id qA418HiP032498 for ; Sun, 4 Nov 2012 03:08:17 +0200 Received: from dsl-aauy6k.dyn.edudsl.gr (dsl-aauy6k.dyn.edudsl.gr [37.32.186.140]) by webmail2.teithe.gr (Horde Framework) with HTTP; Sun, 04 Nov 2012 03:08:25 +0200 Message-ID: <20121104030825.18214e6ylkj7vi15@webmail2.teithe.gr> Date: Sun, 04 Nov 2012 03:08:25 +0200 From: Tzanetos Balitsaris To: freebsd-hackers@freebsd.org Subject: Subversion - Sync Branch with Trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.3.9) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2012 01:08:28 -0000 Hello, During my GSoC project, I branched HEAD in order to use it for the development of the client side part of my project. After some changes, I tried to sync my branch with HEAD but I have faced an error. Now, I am trying once again to sync my branch with HEAD, but I get the exact same error. The error is the following: svn: E175002: PROPFIND of '/socsvn/!svn/bc/236241/mirror/FreeBSD/head/sys/dev/usb/controller': 207 Multi-Status (https://socsvn.freebsd.org) svn: E175002: Error reading spooled REPORT request response The error appears after 2 hours of syncing my branch with HEAD, with U (updated) as the svn status code for most of the files, and 4-6 of them that I resolved the conflicts by selecting tf (theirs-full). This is what I do to sync my branch with trunk (as described in the SVN Book [1]): # the root of my working copy, it contains the .svn, client-side, and server-side directories cd /home/tzabal/akcrs svn status if [ no local modifications reported ]; then svn merge https://socsvn.freebsd.org/socsvn/mirror/FreeBSD/head client-side/akcrs-head fi Can you propose any solutions in order to sync my branch with HEAD? Regards [1] Keeping a Branch in Sync, http://svnbook.red-bean.com/en/1.6/svn.branchmerge.basicmerging.html P.S. The project's code is located at http://svnweb.freebsd.org/socsvn/soc2012/tzabal/ -- Tzanetos Balitsaris ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.