On 5/3/06, Manfred Geiler <[EMAIL PROTECTED]> wrote:
Sean,
what you are proposing is something like this:
.../myfaces/core/branches/1_1/1_1_2
.../myfaces/core/branches/1_1/1_1_3
.../myfaces/core/trunk <-- JSF 1.2
Right?
What about the following solution:
.../myfaces/core_1_1/trunk
.../myfaces/core_1_1/branches/1_1_2
.../myfaces/core_1_1/branches/1_1_3
.../myfaces/core_1_2/trunk
.../myfaces/core_1_2/branches/1_2_0
.../myfaces/core_1_2/branches/1_2_1
Is it possible to merge code from different repo roots?
In other words: Would we be able to merge down (up?) changes from
.../myfaces/core_1_2/trunk to .../myfaces/core_1_1/trunk ?
Manfred,
In Subversion, you can merge from anywhere to anywhere else; "trunk"
and "branches" are just conventions.
-- Adam