[p4] automated resolve issue

[Robert Cowham]

This sort of thing is tricky to understand without a good time diagram
showing what revision did what and when.

The best explanation for what Perforce does is Laura Wingerd's presentation
(very detailed!):

http://www.perforce.com/perforce/conferences/eu/2006/presentations/laura_win
gerd/ConvergenceVsDivergence.html 

> -----Original Message-----
> From: perforce-user-bounces at perforce.com 
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of 
> Nicolas Brault (2K Czech)
> Sent: 08 October 2009 16:56
> To: perforce-user at perforce.com
> Subject: [p4] automated resolve issue
> 
> Hi,
> 
>  
> 
> I would like to know if me and my company are the only ones 
> having trouble during a resolve process.
> 
>  
> 
> I explain:
> 
> Imagine a file which is available on 3 branches (Trunk, 
> BranchA, BranchC).
> 
> (BranchC has been created from BranchB which has been created 
> from Trunk. 
> 
>  BranchA has been created from Trunk)
> 
>  
> 
> - The file has been modified on branchA and BranchC.
> 
> - The file is merge from branchA to Trunk (automated resolve, 
> no conflict). At this point there is no problem.
> 
> - the file is from BranchC to trunk (automated resolve, no conflict). 
> 
>  
> 
> The problem is that after the second merge, we lost some 
> modifications that came from the merge BranchA to trunk. And 
> I don't understand why...
> but it's really dangerous because we can lost lot of code
> 
>  
> 
> Thanks,
> 
> Nico
> 
>  
> 
>  
> 
>  
> 
>  
> 
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com 
> http://maillist.perforce.com/mailman/listinfo/perforce-user