All of lore.kernel.org
 help / color / mirror / Atom feed
* How to synchronize local svn with official svn?
       [not found] <489DB869.36DEE3.07156@m12-70.163.com>
@ 2008-08-10  1:42 ` y.volta
  2008-08-10  2:44   ` David Fries
  2008-08-10  3:38   ` Colin D Bennett
  0 siblings, 2 replies; 3+ messages in thread
From: y.volta @ 2008-08-10  1:42 UTC (permalink / raw)
  To: grub-devel

hi all,

    I have a question about using svn: how can i synchronize the local copy with the local svn and official svn? 
for examle:

    1. i checkout the official grub2 from SA (svn://svn.sv.gnu.org/grub/trunk/grub2) to LD (/home/grub2);

    2. and then, i create a local site to host the grub2 - SB ( i.e. svn://local/grub2 ), 
    
    now, i can 'Relocate' LD's url to SB, and 'Update' LD to SB. here, i get a local svn copy, and can do anythings but the synchronization from SA.

    so, how to synchronize local svn with official svn? any suggestion?

Y.Volta



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: How to synchronize local svn with official svn?
  2008-08-10  1:42 ` How to synchronize local svn with official svn? y.volta
@ 2008-08-10  2:44   ` David Fries
  2008-08-10  3:38   ` Colin D Bennett
  1 sibling, 0 replies; 3+ messages in thread
From: David Fries @ 2008-08-10  2:44 UTC (permalink / raw)
  To: The development of GRUB 2

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 <david@fries.net>
http://fries.net/~david/ (PGP encryption key available)



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: How to synchronize local svn with official svn?
  2008-08-10  1:42 ` How to synchronize local svn with official svn? y.volta
  2008-08-10  2:44   ` David Fries
@ 2008-08-10  3:38   ` Colin D Bennett
  1 sibling, 0 replies; 3+ messages in thread
From: Colin D Bennett @ 2008-08-10  3:38 UTC (permalink / raw)
  To: grub-devel

[-- Attachment #1: Type: text/plain, Size: 1896 bytes --]

On Sun, 10 Aug 2008 09:42:39 +0800
"y.volta" <f22_storm@163.com> wrote:

> hi all,
> 
>     I have a question about using svn: how can i synchronize the
> local copy with the local svn and official svn? for examle:
> 
>     1. i checkout the official grub2 from SA
> (svn://svn.sv.gnu.org/grub/trunk/grub2) to LD (/home/grub2);
> 
>     2. and then, i create a local site to host the grub2 - SB ( i.e.
> svn://local/grub2 ), 
>     now, i can 'Relocate' LD's url to SB, and 'Update' LD to SB.
> here, i get a local svn copy, and can do anythings but the
> synchronization from SA.
> 
>     so, how to synchronize local svn with official svn? any
> suggestion?
> 
> Y.Volta

Well, I'm not sure since you are kind of creating a local mirror, it
sounds like... and Subversion is not a distributed version control
system.  However, if you want to have full distributed VCS features,
you can do what I do and use the Bazaar VCS (bzr) with the 'bzr-svn'
plugin, which allows seamless access to svn branches as if they
were bzr branches.  And then you can use bzr (which is a DVCS like git
or hg) to make local branches and merge changes back and forth between
your branch and the bzr-svn branch which is the upstream GRUB.
It's really easy, all I had to do was install bzr, the bzr-svn plugin,
and then do:

  bzr branch svn://svn.savannah.gnu.org/grub/trunk/grub2

and that created a local 'grub2' branch with full history from the svn
branch.  (This takes quite a while the first time.  But bzr-svn caches
all the history data in ~/.bazaar/svn-cache so it only has to do the
full download once.

Anyway, that's one solution that works great if you want distributed
version control features.  Otherwise, I'll let someone with more recent
svn experience help you (I haven't used svn myself for the past 2 years
since I discovered bzr...).

Regards,
Colin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-08-10  3:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <489DB869.36DEE3.07156@m12-70.163.com>
2008-08-10  1:42 ` How to synchronize local svn with official svn? y.volta
2008-08-10  2:44   ` David Fries
2008-08-10  3:38   ` Colin D Bennett

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.