[cp-patches] [jessie-nio] merge scatter-gather NIO support
tromey at redhat.com
Thu Jun 1 22:07:36 UTC 2006
>>>>> "Casey" == Casey Marshall <csm at gnu.org> writes:
Casey> Hi, I've merged Michael Barker's scatter/gather NIO patch to the
Casey> jessie-nio branch. I had intended to do a more complete merge of HEAD
Casey> into the branch, because a lot has changed since I originally made
Casey> the branch, but it really doesn't seem like it's worth the effort to
Casey> do that. Good NIO support is something we do need on this branch,
Casey> though, so I'm taking that code.
I saw your blog entries on this topic... not much time to reply right
now, but basically there are 2 ways that people address this problem.
One way is to do merges, either using cvs commands (which is a little
tricky, and means tagging the branch-from-which-the-merge-comes at
merge time so that subsequent merges start at the right place). This
is probably in a cvs cookbook somewhere. Another way is what Andrew
H. apparently uses (I never asked :-), namely generating patches by
hand and applying them to the branch. Kind of painful.
The other way is to just give up and make a new branch. This was
pretty common in gcc land. Actually in gcc land people did evil
things involving moving branch tags (this lets you re-branch but keep
the old branch name). I'd prefer we not do that though.
svn (or really any newer VC system) is definitely nicer for this sort
More information about the Classpath-patches