Ethereal-dev: Re: [ethereal-dev] Graphs working

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Gilbert Ramirez <gram@xxxxxxxxxx>
Date: Tue, 05 Oct 1999 00:33:48 -0500
On Mon, Oct 04, 1999 at 11:07:51PM -0500, Bibek Sahu wrote:
> 
> 	Well, I finally did it.  I made histograms work with packet input in
> ethereal.

Great!

> 	* A graph is tied to exactly one summary item.
> 	* Multiple graphs can be tied to the same summary item.

I'm not sure what you mean here by "summary item".

> 	Also note: these changes have been made to a version of ethereal
> that's a few weeks old (from cvs).  I'm not sure how they'll apply with
> these other changes, but the changes made to existing code amount to
> something like 10 lines (the rest are all new files), so it'll probably
> apply cleanly to just about any version.

CVS itself helps you avoid these merge  difficulties. If you do your
work in your local cvs repository copy, you can every so often run "cvs
update". CVS will merge the new code in the central repository into
your working copy. Most of the time it does a great job (because Larry
Wall's patch program is great), but every now and then the patch just
won't work because you've modified a section of code that someone else
modified, but CVS will tell you about the conflict, and you'll have to
do the merge of that section by hand.

> - Bibek
> 
> PS: ahh... I love getting paid to GPL'd work. :-)

I wish I could figure out a way to do that too. :)

--gilbert