Re: Merge of branch to HEAD, failed to update head with any commited branch changes when files were locally modified.

[Jim Hyslop]

James R Kirk wrote:
> This is a multipart message in MIME format.
Please send in plain-text only. The font you've used is quite small and 
difficult to read.

> Jim Hyslop <address@hidden> wrote on 09/01/2005 12:30:26 PM:

>  > Did the 'project' subdirectory exist before the above commands were 
> issued?
>
> The 'project' subdirectory has existed for over ten years we have used CVS.

I meant on the local workstation where you issued the commands.

> The branch sandbox and the fresh merge sandbox were on different servers 
> with CVS mounted from a third server. The merge output files are only on 
> the server where the merge sandbox was created.  I checked and corrected 
> conflict files from the merge in that same merge sandbox.  
> How would the merge conflict files end up in the "merge" sandbox if I 
> ran the merge on the branch?

If the 'project' directory already existed on your merge sandbox, and if 
it had the branch checked out, then the 'cvs co project' command would 
have left the directory on the branch, and the subsequent merge command 
would have either backed out all your changes, or left everything 
untouched (I'd have to run a test to be sure which way it would go, but 
unfortunately I have no CVS access at the moment).

Can you consistently reproduce this problem on a test portion of your 
repository? If so, please post detailed instructions on how to reproduce 
the problem.

> After committing the files after fixing merge conflicts in the merge 
> sandbox, back to the repository, I used tkcvs to do diffs on this and 
> other files from the merge sandbox against the head revisions in the 
> repository, and these files were not committed.  
Were there any error messages on the original commit? What happens if 
you try to commit the files now?

--
Jim