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

Re: [issue 2022]: merge and update touches conflicted files

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-01-24 19:31:32 CET

On Wed, 24 Jan 2007, Nik Clayton wrote:
...
> If it's going to behave like that I'd rather it didn't. How much
> effort would it be for "svn merge" to scan the working copy first
> (or those files in the working copy that will be affected by the
> merge), checking for any files that are marked as conflicted, and
> refuse to merge anything if any files are in conflict.

Incidentally, this is what 'svnmerge.py merge' does (at least, with
the --force option).

  • application/pgp-signature attachment: stored
Received on Wed Jan 24 19:31:48 2007

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