PDA

View Full Version : Possibility of ignoreing section in merge


22-Mar-2004, 12:52 AM
Hi,
I'm trying to figure out how to ignore a certain section when I'm merging two text files. All files in my source tree contains a change history section in the beginning that changes constantly and this results in complex merges all the time even though the code merges are trivial. So my question is:
Is there any way to tag a section as trivial and complex so that the complex part must be manually merged (Change history) and the rest is automatically merged assuming that the code doesn't contain complex changes?

Thanks in advance,
Rune

Craig
23-Mar-2004, 08:35 AM
To ignore sections of a file you'll need to modify you file comparison rules, either using Tools|Edit Current Rules from the file viewer or from the Rules panel in the Options dialog.

Depending on what you want to ignore you should either add a new definition to the "Unimportant Text" area or the "String Literal" area. For multi-line sections you need to use the "Delimited" category. It's usually used for simple things like comments, but you can use more complex start and stop delimiters if necessary.

runechristensen
23-Mar-2004, 09:40 AM
Ok - Got a user account.

Let me specify my problem at bit more.
I am using BC integrated with Continuus from Telelogic as the main merge tool. When I initiate a merge from the Continuus GUI and choose the automatic merge option I want to be able to manually merge the change history in the files but let the rest be automatically merged by BC.

Thanks,
Rune

Chris
24-Mar-2004, 09:32 AM
Rune,

It is possible to have BC ignore a section as described previously by Craig, but BC does not support automated source code merging.