Re: viewing conflicts without really doing update -j

[Paul Sander]

>--- Forwarded mail from address@hidden

>Ronald Petty <address@hidden> writes:

>> When you do a cvs update -j branch_name, you see all the files in the
>> module fly by and it tells you whether there is a conflict or whatever. 
>> Is there a way to do this (see what would happen), without it really
>> doing it?

>If I understand what you are asking, then the command:

>   cvs -n update -j branch_name

>might give you some of what you want...

>--- End of forwarded message from address@hidden

I think that will only give an indication of what would change if a merge
were done.  To actually see the conflicts, you may need to use the pipe (-p)
option of the update command.  But that's probably useful only after the
-n option is used to discover which files need merging.