On 2007-06-20 08:13, James Carlson <[EMAIL PROTECTED]> wrote:
>Giorgos Keramidas writes:
>> For instance, is it common for ON people to run the first pass of a
>> merge, reparent their workspace to an integration workspace, 'push'
>> their half-merged changes to the new parent/integration workspace, ask
>> someone more confident with the conflicting files to complete the merge,
>> and 'pull' the completed merge back?
>
> Roughly, yes. The outline is correct, but the details differ based on
> the individual doing the work.
>
> I'd say a more accurate pattern for complex merges would be:
>
> - create a new "merge" workspace based on the current project
> gate.
>
> - bringover ("pull") files from the main gate.
>
> - resolve as many changes as possible.
>
> - have others take children of that merge workspace.
>
> - they resolve conflicts in whatever way they need, and then
> putback ("push") to the merge workspace.
>
> - finally, the updated merge workspace is resynced with the
> project gate ("pull") and putback ("push") there.
Ah, yes, indeed. I forgot the second reparenting to the gate and the
final bringover/putback.
Thanks for the outline.
I guess now we can email the Hg developers with something which
resembles a sort of functional requirements list :-)
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
