Conference smurf::buildhelp

433.0. "Merge Topic: tele. conf. on 11/11/93 at 11:00-12:00 ..." by SMURF::FILTER (Automatic Posting Software - mail to flume::puck) Fri Nov 19 1993 14:02

Date Of Receipt: 	12-NOV-1993 16:12:18.54
From: 	ABYSS::mildew::mansour
To: 	abyss::odehelp
CC: 	decwet::odestaff, decwet::snow
Subj: 	Merge Topic: tele. conf. on 11/11/93 at 11:00-12:00 ...
Thursday 11/11/93 11: 	00-12:00
Attendance: 	
zso: 	Tina and Rima
zk3: 	Josh, Carolyn, Grant, John, Sean
Merge Topic: 	

  ============

  Adding [ -j ] option to bmerge:
  --------------------------------

     bmerge -j<ancestor_rev>:<merge_rev> <filename>,
             
  where <ancestor_rev>,and <merge_rev> are revision
  numbers or labels that denote existing revisions.


  'bmerge' is the most problematic tool,
  people complain about.

  The group was delighted about the information
  that I'll be working on adding  [ -j ] option
  to bmerge command, which allows users to specify
  both, ancestor and merge revisions, on the command
  line, in a similar manner to 'bco -j', and with
  no history merge overlaps.

  Also, the group thought that updating the .BCSconfig
  file, with the check_out_config string is logical,
  eventhough it might not be the desired behaviour
  in all cases.

  Josh suggested updating the .BCSconfig file with <merge_rev>.
  But, after further discussion, illustrated in the following
  examples, we came up to the conclusion of adding  another option 
  to "bmerge -j", which allows users to specify the revision 
  to update the .BCSconfig with.
 
  examples:
  ======== 

  If user X is in a sandbox backed by bl5, and s/he
  wants to bring up some bug fix or new functionality 
  from bl6, by doing:
 
    bmerge -jbl5:bl6 <filename>

  In this case, updating the .BCSconfig file with bl6 is not
  the right idea, and  check_out_config string seems to be
  the right answer in here.

  But, if user Y is backed by the submit tree, goldos,
  and wants to bring up the files uptodate to bl5,
  from bl4, by doing:

    bmerge -jbl4:bl5 <filename> ,

  updating the .BCSconfig with check_out_config is not right either.
  So, there are cases where users want to pass the revision
  to the .BCSconfig file, by providing it on the command line,
  to "bmerge -j".

/Rima