From users-return-4256-daniel=haxx.se@subversion.apache.org Wed Aug 11 18:26:34 2010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on giant.haxx.se X-Spam-Level: X-Spam-Status: No, score=0.5 required=3.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,T_RP_MATCHES_RCVD,T_TO_NO_BRKTS_FREEMAIL autolearn=no version=3.3.1 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9.1) with SMTP id o7BGQXEB003002 for ; Wed, 11 Aug 2010 18:26:34 +0200 Received: (qmail 16362 invoked by uid 500); 11 Aug 2010 16:26:24 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 16355 invoked by uid 99); 11 Aug 2010 16:26:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Aug 2010 16:26:24 +0000 X-ASF-Spam-Status: No, hits=4.4 required=10.0 tests=FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,HTML_MESSAGE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL Received-SPF: pass (nike.apache.org: domain of dextrous85@gmail.com designates 209.85.215.171 as permitted sender) Received: from [209.85.215.171] (HELO mail-ey0-f171.google.com) (209.85.215.171) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Aug 2010 16:26:19 +0000 Received: by eyg7 with SMTP id 7so203437eyg.16 for ; Wed, 11 Aug 2010 09:25:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=SVx+xoeqPYlCam7CC5F/ltOBbe5ctwnMY9AfIrNgyLc=; b=ibDCchvxZ45sm6rSDJrpt6l3I67vExPzaO8sy9l8P9I3X+CoBWoFufEyp3fRCqqiC2 9ZXmDGb/u4SuwkNfgb1g8QC711j0Sfnbs7qMNJG6nE6dlAprPteddFSk13ooSuaNkRQO XrxE7YKh5Cpvxu39jkOVNRkrQZH6QOYvRHOzA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=k55tUOUPUrJx2odoT7B8nFcWw4QRK21/prwsfsgLpZNeipvjgv5yYQ2zPxf+rhTz5V pHtepdaOuvRtdeXgK9UDuv7OoQQXMpyEA7fmYx2iX/O2YMbeussokWbEOKPSxF+TbIs5 aCkj4T9EOxT+/tAJCgrO5oxCJPP5ySp5+7d84= MIME-Version: 1.0 Received: by 10.213.108.73 with SMTP id e9mr6061781ebp.36.1281543957915; Wed, 11 Aug 2010 09:25:57 -0700 (PDT) Received: by 10.14.48.70 with HTTP; Wed, 11 Aug 2010 09:25:57 -0700 (PDT) In-Reply-To: References: Date: Wed, 11 Aug 2010 21:55:57 +0530 Message-ID: Subject: Re: recommiting already commited files From: vishwajeet singh To: google@alexus.org Cc: users@subversion.apache.org Content-Type: multipart/alternative; boundary=0015174c16ac602ad2048d8eb401 X-Virus-Checked: Checked by ClamAV on apache.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.3.5 (giant.haxx.se [80.67.6.50]); Wed, 11 Aug 2010 18:26:34 +0200 (CEST) X-Friend: Nope --0015174c16ac602ad2048d8eb401 Content-Type: text/plain; charset=ISO-8859-1 On Wed, Aug 11, 2010 at 9:52 PM, alexus wrote: > i have this issue here i was wondering if someone can give me a hand... > > basically i'm running svn server and long story short, we had to > restore some backups > but here is a tricky part... > > the backup that we restore isn't latest they are a day old, but > clients who's using that svn server is in the future commits vs what > svn server has > > what's the best way to deal with this situation? how do clients > recommit stuff to svn server? > Restore the repository from backup and checkout a copy from and manually merge the changes make sure you don't merge .svn directory. > > -- > http://alexus.org/ > -- Vishwajeet Singh +91-9657702154 | dextrous85@gmail.com | http://bootstraptoday.com Twitter: http://twitter.com/vishwajeets | LinkedIn: http://www.linkedin.com/in/singhvishwajeet --0015174c16ac602ad2048d8eb401 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

On Wed, Aug 11, 2010 at 9:52 PM, alexus = <alexus@gmail.com<= /a>> wrote:
i have this issue here i was wondering if someone can give me a hand...

basically i'm running svn server and long story short, we had to
restore some backups
but here is a tricky part...

the backup that we restore isn't latest they are a day old, but
clients who's using that svn server is in the future commits vs what svn server has

what's the best way to deal with this situation? how do clients
recommit stuff to svn server?
=A0
=A0Restore= the repository from backup and checkout a copy from and manually merge the= changes make sure you don't merge .svn directory.



--
Vishwajeet Singh=
+91-9657702154 | dextrous85@gma= il.com | http://bootstraptoday.co= m
Twitter: http://twitter.com/vish= wajeets | LinkedIn: http://www.linkedin.com/in/singhvishwajeet
--0015174c16ac602ad2048d8eb401--