On 21.10.2011 1:56, Bob Archer wrote:
>> 1) Do you usually merge upstream or downstream?
>> 2) Do you set mergeinfo when merging downstream?
>> 3) Do you set mergeinfo when merging upstream?
>> 4) Do you set mergeinfo when merging from feature branch?
>>
>
> 1) We generally only merge up version. A fix is made in the earliest version path where we are going to release it and then merged up to the newer versions. There may be a case where we made a change in a version and needed it in the old version. I'm not sure that happened yet. I assume if it is ever don I would do a record-only merge of the rev in the next version's path so it won't conflict in future merges.
>
> 2, 3 and 4) We always use mergeinfo. (svn sets it automatically)
>
> BOb
Hm, it looks like you should have really huge svn:mergeinfo in your
latest VersionX. Did you notice any slowdown?
Also, as you usually merge upstream, I presume you could encounter
svn:mergeinfo conflict when 2 users merge i.e. into latest VersionX
simultaneously. Has it ever happened to you?
From what I read, I see you use mergeinfo to prevent accidental cyclic
merges. Do you use it for something else? So far I don't understand how
the mergeinfo about upstream merges could be really useful.
Thank you for your valuable comments,
Andrey Paramonov
Received on 2011-10-21 08:24:30 CEST