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

Re: svn 1.3.1 merge bug

From: Norbert Unterberg <nunterberg_at_gmail.com>
Date: 2006-05-19 16:13:12 CEST

2006/5/18, Thomas Börkel <tbo@ap-ag.com>:
> 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.

I reported this on this list more than a year ago, seems the issue got
overlooked:

http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=321790

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 19 16:13:38 2006

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