Hello all,
After having read the svn book, I would like to be sure the
configuration management plan I prepare can be well handled with svn
1.5.
In my existing svn repo, I have a trunk where all developments are done.
From time to time, a release branch is create from trunk.
I also have specific release branches made for customers, based on the
release branch:
trunk
o
| \ rel 1
| o
| |
| o
| | \ rel1-customer1
| | o
| | |
Fixes are done on 'rel1' and backported on 'trunk' and 'rel1-customer1'.
Some fixes may be done on 'rel1-customer1' first then ported on 'rel1'
and finaly 'trunk'.
First question: will svn 1.5 handle those multiple merges properly ?
I mean, if I:
- make a fix on 'rel1-customer1' + backport on 'rel1' (call it 'fix bug 123').
- and later a fix on 'rel1' (fix bug abc').
- when I will try to merge 'rel1' in 'rel1-customer1', will subversion
detect that a part of the changes where already done on
'rel1-customer1' and only import 'fix bug abc' changes ?
The reason why 'rel1-customer1' exists is to deliver specific features
to a customer that cannot wait for the next official release ('rel2').
So I create a 'feat1' branch, that will be merged in 'rel1-customer1'
at the end of the development. This branch will also be merged into
'trunk' to be part of the next official release for everybody.
trunk
o
| \ rel 1
| o
| |
| o
| | \ rel1-customer1
| | o
| | |
| | o
| | | \ feat1
| | | o
| | | |
| | | o
| | | /
| o
| / (direct merge from feat1 to trunk)
o
1) Will subversion be able to merge feat1 into trunk directly ?
2) Can I plan to perform merge from 'feat1' into 'rel1-customer1' on
regular basis ?
3) Can I plan to perform merge from 'rel1-customer1' into 'feat1' on
regular basis ?
4) Can I combine 2 & 3 ?
I hope my questions are clear enough,
Cheers,
Manuel
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-18 13:38:47 CEST