[SSI-devel] Re: Need some info on merging

[Aneesh K. K.V <ane...@hp...>]

Gopalakrishna NM wrote:
> Hi Aneesh,
> I tried to integrate procps changes to Debian branch. I did auto merge 
> FEDORE_FC with OPENSSI_DEBIAN of under the directory openssi/procps.
> It resulted in the merge output (used command cvs -q up -dj OPENSSI-FC) 
> as attached in this mail. There are around 19 files where merge 
> conflicts occurred. Since conflicted files are big number, before 
> proceeding , I would like to ensure what I am doing is right thing or not.
> 
> Please see the attached file and let me know your feedback.
> 

The below diff should get everything built on Debian with the current 
CVS code. I have run just a sanity check of  top and ps command. You may 
want to talk to roopa and do further testing. Just running top shows the 
NODE field.

-aneesh