3 messages in com.perforce.perforce-user[p4] Re: Just when I thought I unders...| From | Sent On | Attachments |
|---|---|---|
| Chris Trueman | 13 Jan 2005 08:28 | |
| ste...@vance.com | 14 Jan 2005 05:01 | |
| Chris Trueman | 14 Jan 2005 05:57 |
| Subject: | [p4] Re: Just when I thought I understood branching... |
|---|---|
| From: | ste...@vance.com (ste...@vance.com) |
| Date: | 01/14/2005 05:01:39 AM |
| List: | com.perforce.perforce-user |
Chris --
Using a client that can see the mainline, try
p4 integ -n -r -b <branch name>
where <branch name> is the name of the branch spec. The -r flag tells integ to treat the directional sense of the branch spec in reverse. As with all integrations, the workspace has to map the target of the branching operation, in this case mainline.
Steve
Chris Trueman writes:
...I successfully branched a common utility into a specific product release branch. Since I made some common enhancements to the utility I now want to integrate back into the main line.
I created a branch spec to handle the initial branch and simply want to see what files would be affected by the integration into the main line.
I tried:
p4 integrate -n -b <branch name>
Using a client that can only see the branched files.
I tried the same using a clientspec that can only see the mainline files.
I tried the same using a clientspec that can see both the branch and mainline files.
I tried various:
P4 integrate -n -b <branch name> //depot/mainline/...
And all I can get is:
... - no target file(s) in both client and branch view.
Any help much appreciated.
Thanks.
Chris.
_______________________________________________ Come to the 2005 Perforce User Conference, April 14 & 15 in Las Vegas. Learn more: http://www.perforce.com/conf
perforce-user mailing list - perforce-user at perforce.com http://maillist.perforce.com/mailman/listinfo/perforce-user
==================== Stephen Vance http://www.vance.com