What about externals? If a folder is the container you wish to keep "in
sync", the externals property could do that for you. Using externals,
checkouts/commits to either one ultimately go back to the single
underlying source location. So, if you have trunk and then in the
branch you configure the externals property to reference trunk, a
working copy checked-out from either would result in commits going to
trunk and appearing in both.
~ Brian
Carlos Beppler wrote:
> I think that he wants something like the "share" feature of Visual Source Safe.
>
> The file or project (directory) that is shared works like symlink
> where you can change the contents of the file on both ends and the
> change is visible on both ends. If you want to stop the share you
> select the "branch" command an then they starts to have separated
> contents again.
>
> On Thu, Nov 26, 2009 at 13:42, Blair Zajac <blair_at_orcaware.com> wrote:
>
>> On Nov 26, 2009, at 6:10 AM, Asbjørrn Sæbø wrote:
>>
>>
>>> I would like to have a branch for a different variant of our software. In the branch, some of the files will be changed. The other files I would like to keep identical between trunk and the branch. That is, I would like to avoid the parallel maintenance of the same file in the trunk and the branch. Are there any "magical" tricks I can do to keep some files more or less automatically synchronized and identical between the trunk and the branch?
>>>
>>> Basically, what I think I need is some kind of "overlay" mechanism, where a branch would take it's files from the trunk, _unless_ they have been changed in the branch. And where a change applied to the trunk would also take effect in the branch. That is, the branch would, for files that have not been changed in the branch, just follow the trunk. Is anything like this possible?
>>>
>>> (It seems to me that Aegis may have some form of "inheritance" between branches, where a change that is needed in more than one branch may be applied to their common ancestor. Something like that might be similar to what I need.)
>>>
>> So you're looking for a feature where if any portion of a file has been changed in the branch then merges from the trunk for that file are not applied, even if the branch and trunk modifications affected different portions of the file?
>>
>> If this is what you're looking for, what kind of files do you want to do this with?
>>
>> Regards,
>> Blair
>>
>> --
>> Blair Zajac, Ph.D.
>> CTO, OrcaWare Technologies
>> <blair_at_orcaware.com>
>> Subversion training, consulting and support
>> http://www.orcaware.com/svn/
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424618
>>
>> Please start new threads on the <users_at_subversion.apache.org> mailing list.
>> To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
>>
>>
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424623
>
> Please start new threads on the <users_at_subversion.apache.org> mailing list.
> To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424627
Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-11-26 17:11:39 CET