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

Re: Conceptual branching bug?

From: Ryan Schmidt <subversion-2008c_at_ryandesign.com>
Date: Wed, 15 Oct 2008 16:48:51 -0500

On Oct 15, 2008, at 09:29, cmk1523 wrote:

> Say a project has only two files (to keep things simple):
> 1. code.c
> 2. design.pdf
>
> Project lifestyle:
> 1. Make a new base repository
> 2. Users checkout, modify, merge, commit
> 3. More users checkout, modify, merge, commit
> 4. One branch is made (aka Alpha), another branch his made (aka Bravo)
> 5. Users under the Alpha configuration need the code and design to
> look a
> specific way. Users checkout, modify, merge, commit under their
> branch.
> 6. Users under the Bravo configuration need the code and design to
> look a
> specific way. Users checkout, modify, merge, commit under their
> branch.
>
> Problem...
> 7. Users under Alpha or Bravo find some bugs in the base code and/
> or design,
> but Alpha and Bravo can't exactly merge because their specific
> configurations will always be different.
>
> How does Subversion handle this problem? Because the Alpha and
> Bravo guys
> have different configurations, they can merge code, but constantly
> have to
> ignore certain changes.

It should be handled by merging. Even if alpha and bravo have some
differences with respect to trunk, they are hopefully similar enough
that when a bug is fixed on trunk, that change by itself can be
merged to the alpha and bravo branches, perhaps with some manual
conflict resolution.

Or maybe I don't understand what you mean by "different configurations"?

> Furthermore, they can't really merge the design
> since the design is in PDF format.
>
> How should I handle this scenario?

Binary files like PDF will have to be merged by hand. For example if
a change is made to the PDF on trunk, but you already have other
changes to it in your branch, you will need to re-make that change in
the branch. So it's important to describe changes to binary files
very well in your log messages. Or have the person who made the
change on trunk re-make it in the branch.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-15 23:49:19 CEST

This is an archived mail posted to the Subversion Users mailing list.