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_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-21 20:18:59 CEST