Antwort: Antwort: Re: [p4] Integration question (merge)
patrick.baur at azgrp.ch
patrick.baur at azgrp.ch
Wed Dec 12 00:52:51 PST 2001
While trying your hint with forced integrateion I actually found a way to
identify affected files. What I did:
Force integration from a to b.
-> All files are conflicting.
Auto-resolve all conflicts.
-> All files are resolved EXCEPT those I manually merged.
Revert all files that are not conflicting anymore.
Accept theirs on all conflicting files (with caution for local edits
in the meantime).
Whereas this seems to work, I am not really happy with it, as I am still
not convinced that the two trees MUST be equal afterwards...
An: perforce-user at perforce.com, Chuck Karish <karish at well.com>
Thema: Antwort: Re: [p4] Integration question (merge) (Document link:
First, thank you for your help. integrate -f should work. However, this
means that I have to remember the files that need to be forced. I normally
just do an integrate on the entire file tree. If I do this with force, it
will reintegrate everything, which is much more than I need. What disturbs
me most when doing this is, that I loose track of what really changed.
Chuck Karish <karish at well.com>@perforce.com am 12.12.2001 06:42:12
Gesendet von: perforce-user-admin at perforce.com
An: patrick.baur at azgrp.ch, perforce-user at perforce.com
Thema: Re: [p4] Integration question (merge)
What happens after you do 'p4 integ -f //depot/dev/a/file
At 09:29 PM 12/11/2001 +0100, patrick.baur at azgrp.ch wrote:
>I seem to have some misunderstanding of Perforce integrate / merge
>are two codelines for developer a and b, respectively.
>>From time to time I want to synchronize their work. So I created a branch
>spec of the form:
> //depot/dev/a/... //depot/dev/b/...
>Everything works fine as long as you do not manually merge. With a simple
>integrate you move changes from a to b and with a reverse integrate you
>move changes from b to a.
>Now I (back) integrated changes from b to a, manually merging the files
>(i.e. the resulting file for a is neither b's version nor a's original
>version). The result is, that a gets the merged version, and b stays with
>his. So far so good.
>The big question now: How do I propagate the merged version from a to b???
>If I do the normal integrate on the branch spec, it doesn't take the
>manually changed files into account, i.e. they won't synchronize. Why
>doesn't perforce recognize the two files are different, or how do I have
>proceed to make perforce synchronize them?
>Thanks for any help!
>pbaur at dplanet.ch
>perforce-user mailing list - perforce-user at perforce.com
Chuck Karish karish at well.com (415) 317-0182
perforce-user mailing list - perforce-user at perforce.com
More information about the perforce-user