Re: [Codestriker-user] excluding files that have changed as a result of an SVN merge ...

[Maxime L. <max...@ya...>]

Hi,

Rin...@em... a écrit :
> Is there any way to generate topics of commited code (subversion) that
> exclude files that have changed as the result of a merge?  We have
> developers trying to create topics of code that spans, say, revs 4019 -
> 4032 but there's been a merge at, say, 4026 that pulled in a bunch of
> changes that aren't relevant to the topic.  They only want the topic to
> include their own changes.  Is there any way to do this?
>   
We have a similar problem at work. We use work branches to do 
modification to the code; before merging back to the main branch we use 
CodeStriker to do a code review of the whole changes. Normally we merge 
changes from the stable branch to the work branch before creating the 
topic. That way only changes related to the branch show up in the diff.

The trick here is to force CodeStriker to create a topic between two 
branches in Subversion, instead of a single branch between two 
revisions. You can either use the patch file feature of CodeStriker or 
modify CodeStriker to accept two branches. I did the later against CS 
1.9.3 (or 1.93?). I do not think it is directly mergeable in the main 
trunk of CodeStriker, but it should be available on request.

However, your merge scheme could be more complex that ours, so it may 
not be the perfect solution...


I hope that helps!

Maxime Larocque

Software Developer
ICx Radar Systems