Conference smurf::buildhelp

478.0. "Shared sandbox / merge problems" by SMURF::FILTER (Automatic Posting Software - mail to flume::puck) Tue Dec 21 1993 15:24

Date Of Receipt: 	15-DEC-1993 17:58:38.58
From: 	WASTED::"[email protected]" "15-Dec-1993 1803"
To: 	[email protected]
CC: 	[email protected], [email protected], [email protected],
	[email protected]
Subj: 	Shared sandbox / merge problems

Hi,

I'm working with a shared sandbox and I'm at the point where I need to sync
some of my files with what is in a newer backing tree.  

My files have previously been submitted to the shared sandbox.  I check
them out from the shared sandbox into my sandbox, check them back in (with the 
express intent to merge) and when I bmerge to either (1) a specific revision 
level, i.e. "-r1.1.2.3" or (2) with a symbolic version, i.e. "-r$NEW" or (3) 
attempt a double revision level merge, i.e. "-rX -rY", I find that _only_ the 
ODE comment headers and the RCS string show up as diffs.  My changes that were 
in the file that exists in the shared sandbox are not seen in the bmerge.  When
I use a double revision level merge, (with the specific revisions being the one 
I want to merge with and my own version), bmerge tells me it finds a common 
ancestor (the newer file) and substitutes that for the one I have checked out 
in my sandbox.

We thought that the problem might be that the shared sandbox needed to be backed
to the pool that contained the version of the file that I was trying to merge
to, but the behavior is the same regardless of what the shared sandbox is 
backed to.

We haven't had problems merging with files in the shared sandbox, but this is
the first time I've ever tried to merge with revisions that exist outside of
the sandbox in other backing-trees.

Is this a bug?  Or do I have to do merge operations from within the shared
sandbox itself, or am I doing something really wrong?


Thanks in advance,

Scott