[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge of branch to HEAD, failed to update head with any commited bra
Re: Merge of branch to HEAD, failed to update head with any commited branch changes when files were locally modified.
Thu, 01 Sep 2005 12:30:26 -0400
Mozilla Thunderbird 1.0.6 (Windows/20050716)
James R Kirk wrote:
cvs-1.11.20-1 running on SUN sparc ultra-4, SunOS 5.8
Checked out the current HEAD of a project to a temporary merge sandbox.
cvs co project
Followed with the merge of latest changes on the branch( first merge
from the branch to the HEAD
cvs update -j branchtag project
Merge did not update any files that had been locally changed in a
developers sandbox of that branch.
I did not expect the merge to pick up uncommited local changes.
*But I did expect CVS to merge the number of earlier commited
changes to the same files on the branch*.
I have looked the latest on-line CVS documentation, and could not find
any mention of this type of behavior.
My developers are asking how the cvs merge process even knew about the
uncommited changes in the branch sandbox?
There is only one way for this to happen: the merge command was issued
from within the branch sandbox, and not from within the fresh checkout.
Did the 'project' subdirectory exist before the above commands were issued?
A cvs status on the merge sandbox for one of the files in question gave
File: qwreloadout.sc Status: Locally Modified
Working revision: 1.13 Result of merge
Repository revision: 1.13
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
This file was not updated with the twelve changes commited earlier to
this file on the branch:
How do you know this? The output of the status command is meaningless in
this context. All it tells you is that the file has been modified, as a
result of the merge command. Have you tried running 'cvs diff' for the
file in question?