| Date Of Receipt: 17-FEB-1994 18:39:08.53
From: WASTED::jmf "Joshua M. Friedman ULTRIX SDE 17-Feb-1994 1837"
To: keane@dec:.zko.giants (Brian Keane)
CC: wasted::odehelp, [email protected], jmf@wasted:zko.dec
Subj: Re: Question, re: merging files back for bugfixes
Brian, what you have seems to be about the best merge method I could
think to recommend, however, be wary of other functionality in any of
these files which aren't part of the patch you're trying for...
Also, I don't know how cleanly a diff/overlap you'll get from bco -j
since these sources are on different "branches". You may have alot of
redundant diffs showing up as overlaps. Then again it may be great.
-josh
--------
Date: Thu, 17 Feb 1994 18:27:38 -0500
Message-Id: <[email protected]>
From: [email protected] (Brian Keane)
To: [email protected]
Cc: [email protected], [email protected]
Subject: Question, re: merging files back for bugfixes
Scenario:
I have to create a patch for libpthreads for V1.3. The basis for this
patch will be a number of source files that are already in the pool for
Sterling, and I will want to submit them to V13SUPPORTOS (or whatever....)
How is this best (read: most easily) done?
Do I need to do a merge, ie:
bco -km -jAGOSMAINT:AGOSMINOR file.c
or is there another way?
Thanks,
Brian
|