[cvsnt] Re: Cut-and-paste bug in update.cpp

Tony Hoyle tony.hoyle at march-hare.com
Mon Jul 11 16:52:04 BST 2005


Steven J. Magnani wrote:
> Hi,
> 
> The following code in cvsnt-2.5.01.1976/src/update.cpp looks like a bug
> to me:
> 
> void set_global_update_options(int _merge_from_branchpoint, int
> _conflict_3way, int _case_sensitive, int _force_checkout_time)
> {
> 	force_checkout_time=_merge_from_branchpoint;
> 	conflict_3way=_conflict_3way;
> 	case_sensitive=_case_sensitive;
> 	force_checkout_time=_force_checkout_time;
> }
> 
> Shouldn't the first line in the function be:
> 
> merge_from_branchpoint=_merge_from_branchpoint;
> 
Yes.  Thanks for that.

Tony



More information about the cvsnt mailing list