[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Add changes from a local svn repo to the same but older repo on a server with history

From: Eric Johnson <eric_at_tibco.com>
Date: Wed, 3 Apr 2019 10:57:08 -0700

On Tue, Apr 2, 2019 at 10:08 PM <tuxic_at_posteo.de> wrote:

>
> On 04/01 09:23, Eric Johnson wrote:
> > Hi mcc,
> >
> > On Mon, Apr 1, 2019 at 5:40 AM <mylists_at_posteo.de> wrote:
> >
> > > Hi,
> > >
> > > (I am not subscribed and appreciate to be CC:ed by any reply to my
> > > question. Thank you! :) )
> > >
> > > The setup is some freaking weired and I am no native speaker...
> > >
> > > The setup: There is a remote SVN-server, I can only access via PC "A"
> at
> > > place "A".
> > > I am working, compiling, developing at PC "B" at place "B".
> > > Changeing places and PCs is .... hrrrrmmm ... "less effective"....
> > > hrrrmmm.
> > >
> > > I am working with repo "A" on the SVN-Server.
> > >
> >
> > Quite the unpleasant setup....
> >
> >
> > >
> > > To be able to check in changed sources not only at the beginning of the
> > > project and at
> > > the end of the project but in logically reasonable portions I came
> > > accross an idea...
> > > from which I dont know whether it works or not....
> > >
> > > 1) Export the repo "A" from the server.
> > >
> >
> > svnrdump
> >
> >
> > > 2) Create an empty local repo of the same structure.
> > >
> >
> > svnadmin create
> >
> >
> > > 3) Import the sources into the local repo at PC "B"
> > >
> >
> > svnadmin load
> >
> >
> > > 4) Check in logically sized portioned into the local repo.
> > >
> >
> > svn add, svn commit , ...
> >
> > 5) If completed transfer the local repo to PC "B".
> > >
> >
> > 6) Transfer the changes with historie, logs, etc into the server on top
> > > of the repo.
> > >
> >
> > svnadmin dump --incremental ...
> >
> > svnadmin load ...
> > # but this is where the whole thing goes off the rails.
> >
> > The load command would only work if nobody else touches the repository
> (in
> > a way that conflicts) in the meantime. Assuming this is unlikely.
> >
> > The most obvious alternative that I can think of is to use "git-svn".
> > Instead of pushing changes to Subversion, push them to Git. Keep changes
> in
> > Git in sync with the main Subversion repository.
> >
> > Whenever you're ready, push changes from Git back to Subversion.
> >
> > Eric.
> >
> >
> > >
> > > Point 5) and 6) gives me headaches....
> > >
> > > How can I minimize the PC "A" <=> PC "B" changes by simutanously being
> > > able to checkin
> > > logically sized portions including all other informations?
> > >
> > > Thanks a lot for any help in advance!
> > > Cheers!
> > > mcc
> > >
>
>
> Hi Eric,
>
> thank you very much for your informations and help! Very
> appreciated!!! Upto but not including 5) it was already know to me...
> 5) is were the magic (at least for me) begins... :)
>
> Would it be an option to lock the whole repo (with announcement
> before) for the time of doing a 'svnadmin load"...or do you
> meant with "nobody touches the repository in the meantime" the time
> between 1) and end of 6)...?
>

Unfortunately, it means that nobody touches the repository between 1 and
6....

I think the git-svn approach is likely to be the most successful strategy.

Eric.

>
> Cheers!
> mcc
>
>
>
>
>
>
Received on 2019-04-03 19:57:38 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.