How to Force Conlicts

"herders" <[email protected]> Thu, 09 Jul 2009 19:52:39 -0000
Newsgroups gmane.comp.version-control.cvs.gui.user
Message-ID <[email protected]>
Hi,

There are a few developers working on the files.

The files have been modified and CVS is not recognizing the changes as valid changes.

ie.

version 1.1

public void hi()
{
string test = "" ;
}
version 1.2
public void hi()
{
string test = string.Empty ;
}
version 1.3
public void hi()
{
string test = "" ;
string test2 = string.Empty ;
}

but what I really want is 
public void hi()
{
string test = string.Empty ;
string test2 = string.Empty ;
}

but the new version overwrite the previous changes.

How can I force a conflict on this file.

thanks for any assistance.

Jack




------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/cvsgui/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/cvsgui/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:[email protected] 
    mailto:[email protected]

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/