[mnet-devel] Re: [mnet-cvs]Stopped the metatrackerlib from using stale (pickled) MT c...

[Bryce Wilcox-O'Hearn]

> Modified Files:
>       Tag: branch_metatrackerrouter
> 	metatracker.py 
> Log Message:
> Stopped the metatrackerlib from using stale (pickled) MT contact info
> (when the mt's ip changes, the stale info was preventing the update)

Argh!  You're committing to branch_metatrackerrouter again!  Hey, you're not 
reading this are you?  You aren't keeping up with mnet-devel traffic.  That 
explains it.  Here, I'll Cc: you.

:-)

Regards,

Zooko

P.S.  Myers said on IRC that he would merge your patches from 
branch_metatrackerrouter to HEAD.  However, if you are ready to do more work, 
I think you ought to do the merge yourself rather than making more changes to 
the branch_metatrackerrouter branch.

There shouldn't be any merge conflicts, so the only question is how to tease 
the information out of CVS.  One option is scroll through mnet-cvs looking at 
all patches you committed since "Mon, 06 Oct 2003 06:24:40 PDT" (since that is 
when Myers merged your *previous* changes from branch_metatrackerrouter to 
HEAD).

Another option is to go into a HEAD sandbox and do something like:

cvs update -j branch_metatrackerrouter -D"October 6, 2003 06:30" 

Not sure if that will work.

Someday we'll use a better revision control system where you can just say:

brcs merge -j branch_metatrackerrouter 



-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
mnet-devel mailing list
mnet-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mnet-devel