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

Re: [Issue 2784] New - Add option to resolve conflicts by selecting a specific file

From: Jeremy Whitlock <jcscoobyrs_at_gmail.com>
Date: 2007-05-23 18:09:00 CEST

Hello all,
    Before someone else takes this and runs with it, I would like to
work on this. I'll look into the source to formulate a plan and then
I will send this to you all for review before working on any code.
How does this sound?

Take care,

Jeremy

On 23 May 2007 12:35:22 -0000, markphip@tigris.org <markphip@tigris.org> wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2784
> Issue #|2784
> Summary|Add option to resolve conflicts by selecting a specifi
> |c file
> Component|subversion
> Version|all
> Platform|All
> URL|http://subversion.tigris.org/servlets/BrowseList?list=
> |dev&by=thread&from=583709
> OS/Version|All
> Status|NEW
> Status whiteboard|
> Keywords|
> Resolution|
> Issue type|ENHANCEMENT
> Priority|P3
> Subcomponent|libsvn_client
> Assigned to|issues@subversion
> Reported by|markphip
>
>
>
>
>
>
> ------- Additional comments from markphip@tigris.org Wed May 23 05:35:22 -0700 2007 -------
> This came up in a discussion on IRC and was then brought to the dev@ list.
> Everyone seems to agree it would be a great idea.
>
> It started simple. User wanted a command like this:
>
> svn resolved --accept=mine|yours|orig
>
> Perhaps shortcut to -a=m|y|o
>
> This seems fairly obvious, and is probably easy to code. Basically it would
> resolve the conflict, and also set the WC file to the file specified in the option.
>
> Besides being a user-friendly feature, it would be great for scripting and also
> be useful for GUI tools so that they could have an API to do this.
>
> As the dicussion evolved, it also became clear that this same option could and
> should just be extended to the commands that create conflicts:
>
> merge
> update
> switch
>
> All of these should also support the --accept option. Again, these options
> would likely best be used by people that are using automated scripts and if a
> conflict arises they know the version they prefer.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: issues-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 23 18:09:21 2007

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