From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KS0uu-0001Bw-Pd for mharc-grub-devel@gnu.org; Sat, 09 Aug 2008 22:44:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KS0ut-0001Bl-Gq for grub-devel@gnu.org; Sat, 09 Aug 2008 22:44:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KS0ur-0001BJ-Qm for grub-devel@gnu.org; Sat, 09 Aug 2008 22:44:23 -0400 Received: from [199.232.76.173] (port=43287 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KS0ur-0001BG-N1 for grub-devel@gnu.org; Sat, 09 Aug 2008 22:44:21 -0400 Received: from spacedout.fries.net ([67.64.210.234]:51454) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KS0ur-00059n-Uk for grub-devel@gnu.org; Sat, 09 Aug 2008 22:44:22 -0400 Received: from SpacedOut.fries.net (david@localhost [127.0.0.1]) by SpacedOut.fries.net (8.13.8/8.13.8/Debian-3) with ESMTP id m7A2i7m7030710 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Sat, 9 Aug 2008 21:44:08 -0500 Received: (from david@localhost) by SpacedOut.fries.net (8.13.8/8.13.8/Submit) id m7A2i6fQ030709 for grub-devel@gnu.org; Sat, 9 Aug 2008 21:44:06 -0500 Date: Sat, 9 Aug 2008 21:44:06 -0500 From: David Fries To: The development of GRUB 2 Message-ID: <20080810024406.GA16592@spacedout.fries.net> References: <489DB869.36DEE3.07156@m12-70.163.com> <81F75CB724D94C639091E84E81C41AAC@hp2003> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <81F75CB724D94C639091E84E81C41AAC@hp2003> User-Agent: Mutt/1.5.4i X-Greylist: Sender is SPF-compliant, not delayed by milter-greylist-3.0 (SpacedOut.fries.net [127.0.0.1]); Sat, 09 Aug 2008 21:44:08 -0500 (CDT) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: How to synchronize local svn with official svn? X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 02:44:23 -0000 On Sun, Aug 10, 2008 at 09:42:39AM +0800, y.volta wrote: > hi all, > > I have a question about using svn: how can i synchronize the > local copy with the local svn and official svn? I've solved that problem by using a different source control tool for the local repository. Currently I'm using git, in other cases I've used CVS. That way each revision control program keeps track of their own revisions in its own files which don't conflict with the other. Synchronization is, commit local changes, update remote, commit remote changes to local repository. -- David Fries http://fries.net/~david/ (PGP encryption key available)