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

Request for Feature: svn resolved

From: Michael Klemm <michael.klemm_at_informatik.uni-erlangen.de>
Date: 2004-12-14 16:41:01 CET

Hash: SHA1

Hi there,

I've got a little proposal to extend the features of "svn resolved".
When merging with some branches we get conflicts of files that were
never touched inside the destination for the merge.

Thus, the current way to resolve such conflicts is to simply cp the file
from the source branch "FooBar.cc.merge-right.rXXXXX" to the local file
"FooBar.cc". Doing this for more than 10 files is both error prone and

Maybe svn resolved could do the job if the user was able to specify how
the conflict should be resvoled. I'd like to have additional options to
"svn resolved":

"svn resolved --mine FooBar.cc.mine" resolves the conflict in flavor of
the file FooBar.cc.mine (per cp'ing) and automatically sets the resolved
status of the file. The same applies to --right and --left to flavor the
version that comes from the source branch or the destination branch of
the merge.


- --
Computer Science Department 2, University of Erlangen-Nuremberg
Martensstrasse 3, D-91058 Erlangen, Germany
phone: ++49 (0)9131 85-28995, fax: ++49 (0)9131 85-28809
web: http://www2.informatik.uni-erlangen.de/~klemm
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 14 16:43:12 2004

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

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