You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Sergi Blanch i Torné <se...@calcurco.cat> on 2008/06/21 17:52:41 UTC
Something like vendor branches
Hi!
I'm trying to do something between usual branches but a half way to the vendor
branches, without success.
Mainly, the idea is to have two branches, one the public, another the
development, and some time I want to synchronize them. But the issue is
because I have to have it in different svn repositories.
Now, want I did is an export and an import to the development one:
$ svn export svn://public.org/trunk directory
$ svn import directory/ https://develompent.org/branch -m 'Initial import of
the official 1291 revision.'
$svn checkout https://development.org/branch another_directory
Then I wrote an small python script to change in the '.svn/entries' files
like:
ihead = "https:\/\/development.org"
itail = "\/branch"
ohead = "svn:\/\/public.org"
otail = "\/trunk"
bar = !grep -Hr https://developement.org/branch *
bar.append(".svn/entries:"+str(ihead)+str(itail))
foo = []
for i in bar:
foo.append(i.split(':'))
for i in foo:
cmd = "chmod u+w "+str(i[0])+" && sed
\'s/"+str(ihead)+str(itail)+"/"+str(ohead)+str(otail)+"/\' "+str(i[0])+"
> "+str(i[0])+".aux && mv "+str(i[0])+".aux "+str(i[0])
os.system(cmd)
cmd = "sed \'s/"+str(ihead)+"/"+str(ohead)+"/\' "+str(i[0])+"
> "+str(i[0])+".aux && mv "+str(i[0])+".aux "+str(i[0])+" && chmod
u-w "+str(i[0])
os.system(cmd)
Arrived to this point in the work directory I think I'll be able to do an 'svn
up' to do the sync, but this call delete the files until wants to go to the
first directory that appears the error:
svn: Failed to add directory 'm4': object of the same name already exists
Does this hackish have any sense? Maybe there are an svn command that performs
it. And about the script, what I am doing wrong?
Sano kaj liber!
/Sergi.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Something like vendor branches
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 21, 2008, at 4:37 PM, Sergi Blanch i Torné wrote:
>>> Yes, probably I miss much information. Little time a go I sing the
>>> assignment
>>> with the FSF to contribute in the elliptic curves development. This
>>> means in
>>> introduction time, during which I'll send patches to be verified if
>>> it work
>>> fine. I'm working with my svn server, but I want to update to the
>>> main
>>> branch. Does it have more sense?
>>
>> It sounds like svn may be a better tool for that. It's build on top
>> of the Subversion libraries.
>>
>> http://svk.bestpractical.com/view/HomePage
>
> Oau! It seems just what I want! I didn't search under the words
> 'repository
> mirroring' but this fits in with what I want. Really thanks!
And I mistyped "svk" above. That's confusing. But at least I got the
link right. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Something like vendor branches
Posted by Sergi Blanch i Torné <se...@calcurco.cat>.
On Saturday 21 June 2008 23:12:07 Ryan Schmidt wrote:
> On Jun 21, 2008, at 3:53 PM, Sergi Blanch i Torné wrote:
> > On Saturday 21 June 2008 20:36:11 Ryan Schmidt wrote:
> >> On Jun 21, 2008, at 12:52 PM, Sergi Blanch i Torné wrote:
> >>> I'm trying to do something between usual branches but a half way to
> >>> the vendor
> >>> branches, without success.
> >>>
> >>> Mainly, the idea is to have two branches, one the public, another
> >>> the
> >>> development, and some time I want to synchronize them. But the
> >>> issue is
> >>> because I have to have it in different svn repositories.
> >>
> >> It would be a lot easier if you had your branches in a single
> >> repository. Why is this not an option for you?
> >
> > Yes, probably I miss much information. Little time a go I sing the
> > assignment
> > with the FSF to contribute in the elliptic curves development. This
> > means in
> > introduction time, during which I'll send patches to be verified if
> > it work
> > fine. I'm working with my svn server, but I want to update to the main
> > branch. Does it have more sense?
>
> It sounds like svn may be a better tool for that. It's build on top
> of the Subversion libraries.
>
> http://svk.bestpractical.com/view/HomePage
Oau! It seems just what I want! I didn't search under the words 'repository
mirroring' but this fits in with what I want. Really thanks!
/Sergi.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Something like vendor branches
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 21, 2008, at 3:53 PM, Sergi Blanch i Torné wrote:
> On Saturday 21 June 2008 20:36:11 Ryan Schmidt wrote:
>> On Jun 21, 2008, at 12:52 PM, Sergi Blanch i Torné wrote:
>>> I'm trying to do something between usual branches but a half way to
>>> the vendor
>>> branches, without success.
>>>
>>> Mainly, the idea is to have two branches, one the public, another
>>> the
>>> development, and some time I want to synchronize them. But the
>>> issue is
>>> because I have to have it in different svn repositories.
>>
>> It would be a lot easier if you had your branches in a single
>> repository. Why is this not an option for you?
>
> Yes, probably I miss much information. Little time a go I sing the
> assignment
> with the FSF to contribute in the elliptic curves development. This
> means in
> introduction time, during which I'll send patches to be verified if
> it work
> fine. I'm working with my svn server, but I want to update to the main
> branch. Does it have more sense?
It sounds like svn may be a better tool for that. It's build on top
of the Subversion libraries.
http://svk.bestpractical.com/view/HomePage
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Something like vendor branches
Posted by Sergi Blanch i Torné <se...@calcurco.cat>.
On Saturday 21 June 2008 20:36:11 Ryan Schmidt wrote:
> On Jun 21, 2008, at 12:52 PM, Sergi Blanch i Torné wrote:
> > I'm trying to do something between usual branches but a half way to
> > the vendor
> > branches, without success.
> >
> > Mainly, the idea is to have two branches, one the public, another the
> > development, and some time I want to synchronize them. But the
> > issue is
> > because I have to have it in different svn repositories.
>
> It would be a lot easier if you had your branches in a single
> repository. Why is this not an option for you?
Yes, probably I miss much information. Little time a go I sing the assignment
with the FSF to contribute in the elliptic curves development. This means in
introduction time, during which I'll send patches to be verified if it work
fine. I'm working with my svn server, but I want to update to the main
branch. Does it have more sense?
> > Now, want I did is an export and an import to the development one:
> > $ svn export svn://public.org/trunk directory
> > $ svn import directory/ https://develompent.org/branch -m 'Initial
> > import of
> > the official 1291 revision.'
> >
> > $svn checkout https://development.org/branch another_directory
> >
> > Then I wrote an small python script to change in the '.svn/entries'
> > files
> > like:
>
> I don't think anybody here is going to help you hack the contents of
> the .svn directory. It is supposed to be off-limits.
Also another option is what I did until now. That is, prepare a diff file from
the old sources, with my changes, and apply it to the other checkout and get
the same movement back.
Thanks!
/Sergi.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Something like vendor branches
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 21, 2008, at 12:52 PM, Sergi Blanch i Torné wrote:
> I'm trying to do something between usual branches but a half way to
> the vendor
> branches, without success.
>
> Mainly, the idea is to have two branches, one the public, another the
> development, and some time I want to synchronize them. But the
> issue is
> because I have to have it in different svn repositories.
It would be a lot easier if you had your branches in a single
repository. Why is this not an option for you?
> Now, want I did is an export and an import to the development one:
> $ svn export svn://public.org/trunk directory
> $ svn import directory/ https://develompent.org/branch -m 'Initial
> import of
> the official 1291 revision.'
>
> $svn checkout https://development.org/branch another_directory
>
> Then I wrote an small python script to change in the '.svn/entries'
> files
> like:
I don't think anybody here is going to help you hack the contents of
the .svn directory. It is supposed to be off-limits.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org