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

RE: Re: Developping on a ReadOnly repository

From: <Stephane.CLINCKART_at_ext.ec.europa.eu>
Date: 2007-03-13 17:00:05 CET

Hi,

Thanks for help.

Another question binded to this solution.

When I try to merge 2 differents version I got an error:
"Skipped missing target"

I think this occur when I try to merge rev 2 to rev 1 into trunk
when file or folder exist in rev 2 and not in rev 1.

How can I "force" the merge to copy new file/folder from rev 2 to trunk???

Thanks.

Stephane

-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2007a@ryandesign.com]
Sent: Tuesday, March 13, 2007 10:43 AM
To: CLINCKART Stephane (DIGIT-EXT)
Cc: users@subversion.tigris.org
Subject: Re: Developping on a ReadOnly repository
Importance: High

On Mar 12, 2007, at 14:42, Stephane CLINCKART wrote:

> I'm working on a project with an external 'vendor' who give us a
> readonly access to his subversion repository.
>
> I (and other people on the project) have to modify the vendor
> source and send changes with the subversion patch feature.
> --> We collaborate to his project
>
> Problem is we (me and my collegua) should like to have a local
> repository.
> (--> we should like to share between us our dailly work and have a
> "backup/history/..." of our work).
>
> How can we do that???

Look at the section on Vendor Branches in the Subversion Book at
http://svnbook.org/ and the svn_load_dirs.pl script. You can get an
export of the code from their repository. Then import it into your
repository (at, for example, /vendor/theircode/current). Then copy it
to make a tag (say, at /vendor/theircode/20070313, or /vendor/
theircode/1.2 if this is a specific version number of their code).
You then copy this to a place where you can work on it (like /
myproject/theircode) noting in the commit message that you're copying
version 20070313 of their code. At a later time when they have
updated their code, you can use svn_load_dirs.pl to update /vendor/
theircode/current with their then-current code, and copy it to a new
tag at, say, /vendor/theircode/20070402. Then you can use "svn merge
$REPO/vendor/theircode/20070313 $REPO/vendor/theircode/20070402" to
update /myproject/theircode to the 20070402 version. Make sure to
note in the commit message to which version you are updating their
code, so that you'll know from what version to merge next time you
need to update it. But by following this recipe, you can keep making
changes in /myproject/theircode, while picking up new changes of
theirs out of the version you import into /vendor/theircode.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 13 17:00:40 2007

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.