From owner-freebsd-questions@FreeBSD.ORG Wed May 1 21:41:15 2013 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 697DE31C for ; Wed, 1 May 2013 21:41:15 +0000 (UTC) (envelope-from lists.dan@gmail.com) Received: from mail-vb0-x22f.google.com (mail-vb0-x22f.google.com [IPv6:2607:f8b0:400c:c02::22f]) by mx1.freebsd.org (Postfix) with ESMTP id 30FEC1504 for ; Wed, 1 May 2013 21:41:15 +0000 (UTC) Received: by mail-vb0-f47.google.com with SMTP id x14so1552763vbb.34 for ; Wed, 01 May 2013 14:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to :content-type; bh=1oH5rSxjGRdqs9Ew1wQB26deZPdqW6HI24NNUTGh7hY=; b=P7xosbYezm4VXGZMnKllkaHpkGMtJhUBnN7+I2wPgoflUrDfHtwe7iNw9Kz2QyjtQn HeBCogsCuARoO9TgwCMM0RxxAEZfVuU4lI9fmwgfs1hhg6lzkMckoE1CUEY8OuphDFfw uXLF+8LDNFRk+udpWLFJ3mKjhTPQFK4+i/Og8aNBfoH33EODdcCX/ZFkUf7uTAsLLjfG FC+0mfeAbLy8qSp0Ef2FPSi81XV00Rqh2NiyHU4IEn/ecKkrisG9zYRinuv8SKt6F0GK UkLUX0pcmMI5ll2iPn/8HkxU9/C4a6fkatjqShXbdrW9ylvU22X6qyX+6jw8BdaNj5Ik K4mA== MIME-Version: 1.0 X-Received: by 10.58.56.161 with SMTP id b1mr1342453veq.42.1367444474722; Wed, 01 May 2013 14:41:14 -0700 (PDT) Received: by 10.58.216.231 with HTTP; Wed, 1 May 2013 14:41:14 -0700 (PDT) Date: Wed, 1 May 2013 16:41:14 -0500 Message-ID: Subject: svnsync and local changes From: Dan Lists To: freebsd-questions Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 May 2013 21:41:15 -0000 Back when cvsup was in use, I mirrored the ports with cvsup-mirror. Then I could add files and make changes. My servers used my repository so they always had my changes and I only had to do them once. I am trying to replicate the same setup now that subversion is used. I've set up svnsync, and that works fine. I was able to add files with 'svn add' and 'svn commit'. My servers properly download all the new files. The problem is I can no longer use svnsync. Now it gives me "Destination HEAD (316955) is not the last merged revision (316951)." I've tried removing my files with 'svn rm', but that just changes the number in the error. Is there some way to get this to work with svnsync? Is there a better way for me to have a local repository that includes local changes? Thanks, Dan