From owner-freebsd-questions@FreeBSD.ORG Wed May 1 23:03:00 2013 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8DF53992 for ; Wed, 1 May 2013 23:03:00 +0000 (UTC) (envelope-from outbackdingo@gmail.com) Received: from mail-ob0-x22f.google.com (mail-ob0-x22f.google.com [IPv6:2607:f8b0:4003:c01::22f]) by mx1.freebsd.org (Postfix) with ESMTP id 5DBFF17F3 for ; Wed, 1 May 2013 23:03:00 +0000 (UTC) Received: by mail-ob0-f175.google.com with SMTP id oi10so13208obb.6 for ; Wed, 01 May 2013 16:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=YQo75/Ku0RhD6DpkYv/swPV57bLopkoxWk47WuKWu1c=; b=ZwsEe6ElxziDFeDHBLV0WHgpkrRgya/17ensrTPoTA1sfxHYsHZxhe2QpF0pSbLF8m rcPmbbyNItKLO2BQYL7hYLXn2BaCHzhAL/g3/uYBjf24OwHUUgIDxCovQxRLDgadMkk6 OaxaJ6GN2qy1UpYHXuhyzhtxGtoHoDOCpFT8/3ZkPki74ZSJg0s1Newpd6f4BT7xifk/ 1G97ssnWC6kWYx2Qzdru8g30ThGskSRMwF2i52Y2r2/bu6N0T04MWr1EN24ZCSkcCT4V IK2XYl5saDD18GRkPDtp2yv6LHrROMe4yTxDxIwgn/BuHZGuralkM959jmMMzx619Y4+ rf4g== MIME-Version: 1.0 X-Received: by 10.60.155.229 with SMTP id vz5mr1120739oeb.37.1367449380004; Wed, 01 May 2013 16:03:00 -0700 (PDT) Received: by 10.76.162.230 with HTTP; Wed, 1 May 2013 16:02:59 -0700 (PDT) In-Reply-To: References: Date: Wed, 1 May 2013 19:02:59 -0400 Message-ID: Subject: Re: svnsync and local changes From: Outback Dingo To: Dan Lists Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: freebsd-questions 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 23:03:00 -0000 On Wed, May 1, 2013 at 5:41 PM, Dan Lists wrote: > 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, > > I do something identical only i use git, and it works fine with local changes and upstream merges, though im pretty sure svn is capable also > Dan > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to " > freebsd-questions-unsubscribe@freebsd.org" >