Re: [codepatch] Re: [discuss] block all hosts
Sam Berlin <[email protected]> Mon, 4 Apr 2005 17:46:23 -0400
| Newsgroups | gmane.network.gnutella.limewire.general |
|---|---|
| Message-ID | <[email protected]> |
> IMO the simplest solution would be a diff of file-filter and your > local copy. The people at LW can apply the patch on the file-filter > branch and merge the whole thing with the mainline. This will preserve > the consistency of the CVS repository and won't create a ton of > conflicts if somebody continues to work on the file-filter branch... > Or am I missing something? Work on the file-filter branch isn't going to be continued. Chuck has some great functionality that goes hand-in-hand with the file-filter patch, though unfortunately the GUI side of it will cause merge conflicts if both are merged separately. To do it correctly, someone ( preferably not us ;) ) needs to manually merge the two patches into a single patch. That aside -- don't feel like we're requiring anything -- if you get lost or bored, just let us know and we can do what we need to. Any contributions are appreciated. :) Thanks, Sam _______________________________________________ discuss mailing list [email protected] http://www.limewire.org/mailman/listinfo/discuss