[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Checkout's over checkouts.

From: Jim.Hyslop
Subject: RE: Checkout's over checkouts.
Date: Tue, 29 Mar 2005 11:59:05 -0500

Euan Guttridge wrote:
> Thanks for the input Jim and Rick, to clarify
> Objective:
> - check out a branch to workspace
> - *overwrite* a number of those files in workspace from 
> various tags (not
> update so there is no possibility of merge conflicts)
> - tag the consolidated workspace
> Caveats:
> - I can't specify tagged files by name (too many)
> - I will use two or more tag sets (of potentially 20 + files each)

Thanks for the clarification.

If you are starting with a fresh checkout, then you do not need to worry
about any kind of merge conflict. Conflicts only occur when you have
modified a file that is about to be merged. If you have not modified the
file locally, then there will be no conflict.

Objective 2 seems to conflict with Caveat 1. How will you determine which
files to overwrite? Also, how frequently will you do this - is this a
one-time task, or will this be done more than once?

Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. ( )
Columnist, C/C++ Users Journal ( )


reply via email to

[Prev in Thread] Current Thread [Next in Thread]