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

Re: Changed handling of conflict file extensions is a usability regression in some situations

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-04-25 23:58:13 CEST

On Wed, 25 Apr 2007, Max Bowsher wrote:

> I just got my first conflict in a Java project using recent trunk code.
> Subversion propagated a .java extension on the conflict files. Which
> caused Eclipse to try to compile them. This is bad, because it meant
> that I couldn't test the compilation of my resolution of the conflict
> until after I'd removed the conflict files.

Here's a similar one from Subversion's own development:

  make: *** No rule to make target `subversion/libsvn_client/log.c.mine.c', needed by `subversion/libsvn_client/log.c.mine.lo'. Stop.

I think I triggered this by running gen-make.py while I had a
conflict. Yuck.

> As a result, I think the new conflict filename behaviour should be
> deactivated by default.

Yeah, or removed entirely.

  • application/pgp-signature attachment: stored
Received on Wed Apr 25 23:58:22 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.