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

svn status does not show conflict in merge added file

From: Brian Buesker <bbuesker_at_qualcomm.com>
Date: 2005-06-28 17:51:14 CEST

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
+ ).

This can be somewhat misleading to a user, although they would realize
there is a conflict once they try to commit as the commit still fails
due to the conflict. Would it be possible for svn status to detect this
situation and show the file as having a conflict rather than showing it
scheduled for addition with history?

I have reproduced this with both 1.1.4 and the trunk. Reproduction
script is attached.

The entire details of my environment are as follows:

OS: Fedora Core 3

SVN Version:
% svn --version
svn, version 1.1.4 (r13838)
  compiled Apr 5 2005, 15:49:54

Copyright (C) 2000-2004 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet
(http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
 - handles 'http' schema
 - handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
 - handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network
protocol.
 - handles 'svn' schema

Compiler:
$ gcc --version
gcc (GCC) 3.4.2 20041017 (Red Hat 3.4.2-6.fc3)
Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Perl:
$ perl -v

This is perl, v5.8.5 built for i386-linux-thread-multi

Copyright 1987-2004, Larry Wall

Perl may be copied only under the terms of either the Artistic License
or the
GNU General Public License, which may be found in the Perl 5 source kit.

Complete documentation for Perl, including FAQ lists, should be found on
this system using `man perl' or `perldoc perl'. If you have access to the
Internet, point your browser at http://www.perl.com/, the Perl Home Page.

Berkeley DB Version: 4.2.52

OpenSSL Version:
$ rpm -q openssl
openssl-0.9.7a-40

Please let me know if you need any more information.

Thanks,
Brian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Tue Jun 28 17:56:45 2005

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