[mnet-devel] notes on the diff of HEAD and branch newnet

[Zooko O'Whielacronx]

Tschechow asked me what it takes to merge newnet onto HEAD.  CVS doesn't seem 
to offer a feature of "show me what I changed on MY branch, ignoring changes 
other people made to HEAD during the same period", so instead I just ran 
"cvs update -jnewnet" and looked at the conflicts.  I also ran 
"diff -u -r mnet_HEAD/ mnet_newnet/" locally and looked at the absolute diff.  

Hm.  It doesn't show any important changes -- just some cleanups I did on 
newnet than conflict with changes in the same code you made on HEAD.

Oh, but this is because we've renamed files -- newnet calls it "ent.py" and 
HEAD calls it "router.py".

<Zooko looks at that.>

Well, "diff" says that every single line has changed, but that's also because 
we renamed things -- HEAD calls it "Router" and newnet calls it "Node".

How do you feel about taking newnet's ent.py and re-doing your changes?  
(Except maybe leave the renaming change out of it for now.)

Okay, so I'll take responsibility for merging the clean-up stuff myself.  
It'll be done tomorrow at the latest.

Let's work together on the merging of router.py/ent.py, and I suggest that we 
agree right now not to refactor or rename or add layering until after the 
merge is complete and test_ent does at least as well on HEAD as it currently 
does on newnet.

--Z



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
mnet-devel mailing list
mnet-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mnet-devel