Yes I have used git, etc - in the past, but we are forced to use svn
for the time being.
What I would like to quantify is if this shortcoming of subversion is
by design or if its a bug. From your description, it seems like the
former, and if so, what is the architectural reasoning?
I understand the concept that the merge to WC records the merge
information, and the merged from has no knowledge of the merge or even
branch for that matter.
Is this a use case that was taken into consideration, and will it be
"fixed" or the functionality/logic added to allow this use case? Is
there a tracker item or roadmap item describing such use, and what
dependancies are blocking the implementation for this?
On Feb 24, 2013, at 7:14 AM, Andreas Tscharner
<Andreas.Tscharner_at_metromec.ch> wrote:
>> So what is the proper way to continuously perform the workflow we're
>> trying to do - that is pull changes from origin path into branch, push
>> changes to origin branch from branch, and repeat.
>>
>> Using bidirectional merge (without reintegrate) seems create severe
>> merge conflicts.
>
> Short answer: There is none (with SVN)
>
> Long(er) answer: We were seeing the same problems here with a similar workflow. We ended up with some rules that actually changed the desired workflow (no merges from trunk to feature branch during development) and caused other problems (big changes when reintegrating the feature branch back to trunk).
> At the moment we are evaluating a DVCS (Mercurial in our case) which pretty much solves these problems (we have others of course)
>
> If I had to guess by the words you use (pull, push), I'd say you have already used a DVCS, right?
>
> Our evaluation lasts until the 7th of March, so I cannot say what our results are, but I think a DVCS is worth a try.
>
> Best regards
> WENZEL Metromec AG
> Andreas Tscharner
> --
> Andreas Tscharner, Development
> WENZEL Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
> phone: +41 (0)81 257 07 00
> fax: +41 (0)81 257 07 01
> e-mail: mailto:andreas.tscharner_at_metromec.ch
> www: http://www.metromec.ch
Received on 2013-02-24 13:56:21 CET