[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn 1.3.1 merge bug

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2006-05-18 11:22:53 CEST


When a merge brings a new file and this file is already existing, versioned
and non-emtpy at the destination wc, the merge command prints "A" as status,
but the file is (correctly) conflicted.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 18 11:23:50 2006

This is an archived mail posted to the Subversion Dev mailing list.