Integrating?

[NaveenPatilnaveen at vinayak.engr.sgi.com]

David Chamberlin wrote:
> 
> I can believe that integrating from one branch to another works just fine.
> However we're integrating from mainline to a branch that wasn't directly
> branched from mainline.
> 
> //depot/mainline/ucp branched to //depot/ucp21w32/ucp
> //depot/ucp21w32/ucp branched to //depot/ucp21w32n/ucp
> 
> And I'm trying to integrate from mainline to ucp21w32n.  I'm not surprised
> that it's confused by this.  So I guess there are two questions:  1)
> *should* this work?  (as I say, I have a hard time believing it can...)

   o------------X---------------------------> mainline
                 \
                  \------------o------------> ucp21w32
                         CP2.1-MR-WIN32
                                \
                                 \----------> ucp21w32n

   Since Perforce knows where //depot/ucp21w32 and //depot/ucp21w32n
   branched from, it could find the common ancestor (X) for the
   integration you're trying to do ... But, v97.3 doesn't seem to
   have that capability yet ...

		
> 2) If it doesn't work, what should we do?  We need to base ucp21w32n on
> ucp21w32 because mainline has drifted too far from ucp21w32, but we still
> need to integrate changes into ucp21w32n from mainline.

   Integrations using 2-way diffs between files on //depot/mainline/ucp
   and //depot/ucp21w32n/ucp would work; just "p4 edit" the files
   and use xdiff/gdiff to generate a merged file ...

> 
> -Dave
> 
> On Wed, 3 Jun 1998, Naveen Patil wrote:
> 
> > I wasn't sure if this would work, and we've never tried it before.
> >
> > There was a discussion in the Perforce users mailing list recently,
> > and was lead to believe that Perforce allows you to integrate from one
> > branch to another ... Will also Cc: support at perforce.com to seek
> > their comments ...
> >

- -- 
_____________________________________________________________________________
Naveen Patil, mailto:naveen at sgi.com		 Silicon Graphics, Inc
[T] (650)933-4311  [Fax] (650)932-4311		 2011 N Shoreline, MS 10U-987
[P] (800)718-6125, mailto:naveen_p at corp.sgi.com  Mountain View, CA
94043-1389
[W] http://vinayak.engr.sgi.com/~naveen          http://www.sgi.com