Re: Conceptual branching bug?

Interesting problem... There's no way for Subversion to be able to
tell whether a change on Alpha or Bravo branch is due to a change in
configuration or a defect, so there's no real way to do a merge
between Alpha and Bravo could be handled automatically.

However, what if defects are changed on trunk, then trunk is merged to
both Alpha and Bravo. Subversion should be able to tell that a
particular difference between the two files is due to a change due to
configuration (because it was made on either the Alpha or Bravo
branch) or a defect (because it was made in trunk). Therefore, you
should probably fix defects on trunk, then merge them to either
branch.

As others have pointed out, PDF files are binary and should not be
involved in merges. (Although Subversion has a bad habit of thinking
they're text files if you don't use auto-properties).

--
David Weintraub
qazwart_at_gmail.com
On Wed, Oct 15, 2008 at 10:29 AM, cmk1523 <cmk1523_at_gmail.com> wrote:
>
> I'm new to subversion so hopefully there is a good workaround to this
> conceptual problem...
>
> 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. Furthermore, they can't really merge the design
> since the design is in PDF format.
>
> How should I handle this scenario?
> --
> View this message in context: http://www.nabble.com/Conceptual-branching-bug--tp19994719p19994719.html
> Sent from the Subversion Users mailing list archive at Nabble.com.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org