rule-based line expansion
Posted: Fri Jan 09, 2009 11:20 pm
Working with perforce and branches, I often find myself manually merging vcproj files.
If both myself and the other branch modified the same line, I get a conflict. With lines like "AdditionalIncludePath", they have a regular delimiter which essentially functions like "line breaks". If I could flag certain lines in certain file times as expandable, I could insure data within that line was both correctly merged and for future ease of reading, correctly sorted.
I envision this as the typical little "+" beside matching lines in a file, that when expanded, turn each subcompent into their own "virtual" lines in CompareIt. I could then merge them with the same ease I have with full line/block diffs.
I hope that made sense. CompareIt is fantastic. I wave it in front of every coder I ever encounter and rave of it's diffing superiority. (almost sounds like I'm swearing!
and Merge anchors are awesome!
Great job.
If both myself and the other branch modified the same line, I get a conflict. With lines like "AdditionalIncludePath", they have a regular delimiter which essentially functions like "line breaks". If I could flag certain lines in certain file times as expandable, I could insure data within that line was both correctly merged and for future ease of reading, correctly sorted.
I envision this as the typical little "+" beside matching lines in a file, that when expanded, turn each subcompent into their own "virtual" lines in CompareIt. I could then merge them with the same ease I have with full line/block diffs.
I hope that made sense. CompareIt is fantastic. I wave it in front of every coder I ever encounter and rave of it's diffing superiority. (almost sounds like I'm swearing!
and Merge anchors are awesome!
Great job.