>>>>> "DK" == Dan Katz <dkatz@xxxxxxxxxxxxxxx> writes:
DK> Hi -
DK> I have a situation where a file still exists on a branch but has been
DK> deleted on the main, and every time I do a global integration from the
DK> branch to the main, I get the message that I need to do an integration
DK> with the "-d" flag:
DK> $ p4 integrate -n /path/to/branch /path/to/main
DK> //main/foo.cpp - can't branch from //branch/foo.cpp#2 without -d flag
<snip>
You could create a branchspec and use this to exclude the file from the
mapping, eg:
# Map everything
//main/... //branch/...
# Except foo:
-//main/foo.cpp //branch/foo.cpp
The leading minus sign, as in client specs, specifies an exclusion.
--Simon
DK> So there has to be a better way to tell the server that I never want
DK> this file on the branch integrated back to main. Any suggestion? I'm
DK> sorry if this is a FAQ, but I didn't see anything obvious on the
DK> Perforce site about this...
DK> Thanks.
DK> Dan
DK> _______________________________________________
DK> perforce-user mailing list - perforce-user@xxxxxxxxxxxx
DK> http://maillist.perforce.com/mailman/listinfo/perforce-user
_______________________________________________
perforce-user mailing list - perforce-user@xxxxxxxxxxxx
http://maillist.perforce.com/mailman/listinfo/perforce-user
|
