I just did a quick test. Resolving with -at (accept their's) from
a subsequent revision didn't cause the file to be created. Forcing a
merge on the next revision caused the new file to only contain that text
for that revision.
Another -at after that, though, didn't affect the RCS file. It still
contained only the one non-branch and non-accept-their's revision.
This was on 2001.2 and seemed reasonable to me.
"William" <wivey at mail.us.itmasters.com> writes:
A directory in the depot is branched creating references to the original
files in the new branch.
The original files are changed and the changed files are integrated to
the branch, completely replacing head revision there.
The question: Will the branch now contain actual files, or will it
contain references to the files in the main branch. (That is, does
the lazy copy feature apply only at branch creation?) -Wm
4 messages in com.perforce.perforce-user[p4] "Lazy Copies" and future integra...