[p4] Question about branching/integrating

Dave Lewis dlewis at vignette.com
Mon Jun 14 12:17:05 PDT 2004


  > From: David Rybolt <dagg at yahoo.com>
  > Cc: perforce-user at perforce.com
  > Sender: perforce-user-admin at perforce.com
  > Errors-To: perforce-user-admin at perforce.com
  > Precedence: bulk
  > List-Help: <mailto:perforce-user-request at perforce.com?subject=help>
  > List-Post: <mailto:perforce-user at perforce.com>
  > List-Subscribe: <http://maillist.perforce.com/mailman/listinfo/perforce-user>,
  > 	<mailto:perforce-user-request at perforce.com?subject=subscribe>
  > List-Id: Discuss Perforce with other users <perforce-user.perforce.com>
  > List-Unsubscribe: <http://maillist.perforce.com/mailman/listinfo/perforce-user>,
  > 	<mailto:perforce-user-request at perforce.com?subject=unsubscribe>
  > List-Archive: <http://maillist.perforce.com/pipermail/perforce-user/>
  > Date: Mon, 14 Jun 2004 11:13:19 -0700 (PDT)
  > 
  > --- Noel Yap <Noel.Yap at morganstanley.com> wrote:
  > > I don't quite understand this last part.  Can you
  > > give an example, please?
  > > 
  > > Thanks,
  > > Noel
  > 
  > I'll give it a shot:
  > 
  >   1. //depot/a/... was branched to //depot/b/...
  >   2. Files in //depot/a/... were edited.
  >   3. Files in //depot/b/... were edited.
  >   4. //depot/b/... was merged into //depot/a/...
  >   5. Developers now want a new place to check in
  >      some files.  They _don't_ know if they 
  >      want to incorporate the latest //depot/a/...
  >      code, but they _do_ know they want to 
  >      incorporate all of the //depot/b/... code.
  > 
  >      I'll create //depot/c/... , but I don't
  >      know where to branch it from.
  > 
  > For #5, we don't know if //depot/c/ will be released
  > to production before or after //depot/a/ .
  > 
  > My inclination is to branch from //depot/b/, but
  > that seems to cause lots of merging headaches, later.

with -I or is it -i, the integrations should go ok...

dave


  > 
  > Dave
  > 



More information about the perforce-user mailing list