Well, I have tried some testing actually. Here are the scenarios and
the results that I came up with:
Scenario #1:
Create a branch off the trunk. Modify the VB form in the branch, save
the changes. Do not modify the trunk at all. Merge the branch back
into the trunk. Subversion overwrites the trunk's frx file with the
frx file from the branch. This scenario works fine.
But, the whole point of branching is so you can have seperate
development going on in the trunk and branch, then merge the changes
back in when necessary. So...
Scenario #2:
Create a branch off the trunk. Modify the VB form in the branch, save
the changes. Modify the same VB form in the trunk, save the changes.
Merge the branch back into the trunk. Subversion merges the frm file
ok, but gives a conflict with seperate left and right versions of the
frx file. This is to be expected, since the frx is binary, and was
changed in the trunk since the branch was created.
I'm not sure that either frx file will be applicable to the form after
doing this. The binary offsets for the frx file listed in the frm
file probably won't match up after the form has been edited by two
different VB developers. Even with good communication, I'm having a
hard time understanding how you could have two lines of development on
a VB form.
If you have any suggestions, I would happily read/listen to them. :-)
On 6/27/05, Brass Tilde <brasstilde@insightbb.com> wrote:
> > Makes sense. I'm about to just give up on the branching/merging plan
> > for our VB developers. The general consensus seems to be that it's
> > impossible to effectively branch/merge VB projects because of the
> > frm/frx marriage.
>
> Not impossible, but like everything else in a group development environment, it takes some time, effort, communication and
> discipline.
>
> > Very disappointing, since this is exactly what we
> > need to do with this team.
>
> I can understand the sentiment, but I don't think it's hopeless. You should at least give it a try before giving up on it.
>
> Brad
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jun 27 16:55:50 2005