Re: "svn resolve" Leaves Temporary Files in WC When More Than One Conflict for a File is Present

> Meaning, if there are two conflicts in a file (and maybe a third in its
> properties), you can mark individually any one of the three as resolved?
> This isn't possible (afaik).

Yeah. That's what I'm talking about, or at least be able to resolve
the whole file, which happens now, and remove all temporary files
associated with this file's conflict(s).

> IIUC, 'svn resolve' should remove the .rN/.rN+1/.mine files, like
> 'resolved' always did. If you need someone to validate this specific
> scenario, please provide a reproduction script. :)

Actually, you got it. Basically the resolve(d) works as designed but
leaving left over temporary files confuses people and causes them to
think Subversion's broken. Ideally, it'd be great to mark each
conflict block as resolved individually or at least remove all
temporary files when you resolve a file, no matter how many there are.

Take care,

Jeremy

P.S. - As for a reproduction script, now that it's somewhat validated,
I guess I could create an issue for this and attach said script to the
issue. Any objections?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-10 21:34:26 CEST