charles i wrote:
> Robert P. J. Day wrote:
>
>> charles i wrote:
>>
>>> Yes - merging directories (in a repository) into one in my
>>> working copy is what I am looking for. Is there any reason why
>>> Subversion doesn't support this? Are there any (other) work arounds?
>>>
>>
>> but how would you define the semantics of such a merge? including
>> how you would commit changes back again? are you suggesting
>> subversion should keep track of which of the two directories each
>> file in the "merged" working copy came from?
>>
>
> That would be the ideal, but I realise not easy to implement,
> especially if there is lots of overlap under the two directories.
>
> However, in most cases, I would suggest that there is no or very
> little overlap - it is quite easy (if you've got sensible package
> names under the two directories) to manually determine where the
> files have been checked out from and where new files should be added.
>
Are you saying you do not have much overlap between the project-
specific code and the common code it's supposed to overlay? If so,
why not just include the common code into the project with
svn:externals?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Oct 16 19:01:14 2005