[p4] Help with integration

Dave Lewis dlewis at vignette.com
Wed Jun 2 09:34:09 PDT 2004


  > From: data <data64 at yahoo.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: Wed, 2 Jun 2004 08:31:03 -0700 (PDT)
  > 
  > I am trying to do some basic integration between a
  > branch and mainline.
  > We are working on project that recently entered the QA
  > phase (well, for the first stage anyway). I branched
  > the code so that bugfixes for issues found during QA
  > and normal development for outstanding items do not
  > step on each other.  I am trying to integrate
  > bug-fixes done in the QA branch back into mainline and
  > seem to have problems with the basics.
  > 
  > the command I tried is
  > cd branch_directory
  > p4 integrate -c 426 -b drop4 -r 'filename#2'
  > 
  > (drop4 branch spec is what I used to do the branch)
  > 
  > It tells me "no such file". However, doing a 
  > p4 filelog filename shows me the file and the revision
  > and that it was branched. I tried leaving out the
  > single quotes and the revision specifier and it still
  > says "file not found". 

The most common error is not being in the client that the change is
going to go into.  It will usually say something like
"no files found in depot and client view"

usually, people like to move individual changelists over, like
p4 integrate -b drop4 -r @1234, at 1234

to move over change 1234

dave


  > 
  > I am probably missing something basic, but I could not
  > figure out what from reading the manuals. I have not
  > had to integrations before except for renaming files
  > so  this is a bit new for me.
  > 
  > thanks,
  > data64
  > 
  > 
  > 
  > 	
  > 		
  > __________________________________
  > Do you Yahoo!?
  > Friends.  Fun.  Try the all-new Yahoo! Messenger.
  > http://messenger.yahoo.com/ 
  > _______________________________________________
  > perforce-user mailing list  -  perforce-user at perforce.com
  > http://maillist.perforce.com/mailman/listinfo/perforce-user
  > 



More information about the perforce-user mailing list