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

Re: svn status does not show conflict in merge added file

From: Norbert Unterberg <nunterberg_at_gmail.com>
Date: 2005-06-28 21:42:07 CEST

2005/6/28, Brian Buesker <bbuesker@qualcomm.com>:
> When a merge is done which adds a file, and then a second merge is done
> which attempts to modify that file but that results in a conflict, svn
> status does not report a conflict but rather still shows the file as
> being scheduled for addition with history (in other words, it shows A
> + ).

I reported this some time ago, but the issue seems to have been forgotten...

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

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 28 21:50:07 2005

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