Re: Unexpected tree conflict after merge

Greetings, Shaun Pinney!

>> I'd like to take a step back first, and ask:
>> Why do you need to merge back and forth between two branches?

> I've often asked the same question :) So, with the partial info I've managed to
> obtain and a with good bit of guesswork thrown in...

> We'll have a trunk containing core code reused for many products. Each
> product will have a branch based off the trunk (and hopefully few-to-zero
> branches off branches). We'll be adding new core features to the trunk,
> and currently have a product which requires a core feature which isn't
> ready yet, so we'll need to merge from trunk to product branches as core
> features become available. Also, I expect that after new core features
> are added, the product requirements for active projects will expand to
> include the new core features and a trunk-to-branch merge would occur
> again.

Make it the right way, implement core features as a library/framework to base
your other projects out of it. Much like Apache and Subversion based on APR.
You'll save yourself not just a day, trust me.

--
WBR,
 Andrey Repin (anrdaemon_at_freemail.ru) 12.11.2009, <12:32>
Sorry for my terrible english...
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2416934
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].