On Thursday, December 18, 2014, Bill McCormick <wpmccormick_at_gmail.com>
wrote:
> Hello,
>
> My team has been using tortoise-svn and subversion to rev control some
> projects where file format is binary. We're using a required lock
> property and svn-hooks to manage and control and we have a change branch
> where we we have been working.
>
> I was hoping I might ask if there is anyone in the group that uses svn
> like this, and ask for some experienced guidance for merging (maybe it's
> not a merge with binaries?) back to the trunk (we call it STABLE). Is
> there something in particular that we need to pay attention to or steps
> that we should consider when merging binary files from a change branch
> back to the trunk?
>
>
>
One thing you should be aware of, is that locking your binary file on a
branch WILL NOT prevent anybody from making changes on trunk, or on any
other branch, while you are changing the file on your branch. So by
branching to make changes, you lose the benefit of the file lock and
svn:needs-lock.
To work around this, you can introduce a workflow that requires users to
lock the file on trunk before they lock it on their branch. If your team
can remember to do this, the trunk lock will serve as the communication
mechanism locking normally provides. You will need to steal your own lock
when it is time to merge.
You can create a hook script for pre-lock that will automatically obtain a
trunk lock first when locking on a branch, and fail the branch lock if the
trunk lock fails, if you want to make this less prone to human error when
people inevitably forget the trunk lock.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093027
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-19 11:33:28 CET