[p4] Make a copied "branch" be a real branch

Robert Cowham robert at vaccaperna.co.uk
Wed Jul 26 15:24:00 PDT 2006


Maybe this article might help:

http://www.vaccaperna.co.uk/scm/branching_casestudy1.html

Robert 

> -----Original Message-----
> From: perforce-user-bounces at perforce.com 
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Dan Halbert
> Sent: 26 July 2006 21:32
> To: Perforce-User List
> Subject: [p4] Make a copied "branch" be a real branch
> 
> Hi, I could use a little advice on the following:
> 
> Instead of creating a real branch, a user copied a directory 
> hierarchy in his workspace and then added the files, something like:
> 
>     % mkdir /path/to/branch1
>     % cp -r /path/to/branch1/somedir /path/to/branch2
>     % p4 add /path/to/branch2/...
> 
> So the branch2/somedir/... files have no history back to 
> branch1. He then edited a few of the files.
> 
> I tracked down the original branch (branch1), which he had 
> forgotten, and the time when he did this. I'd like to 
> integrate this pseudo-branch back into the real branch tree. 
> I could create a new real branch and integrate his changes by 
> hand, but is there an easier way to do this? I tried some "p4 
> integ -i ....." stuff with timestamp specifications in p4v, 
> but couldn't quite get it to work.
> 
> Thanks a lot,
> Dan
> _______________________________________________
> 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