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

Re: [Subclipse-dev] Howto update working copy using own merge functions

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 10 Mar 2008 11:26:26 -0400

On Mon, Mar 10, 2008 at 11:11 AM, Schamil Wackenhut
<schamil.wackenhut_at_gmail.com> wrote:

> i wrote some functions to resolve conflicts and apply changes between a
> remote version (head) and my working copy.
> I want to use this functionality with the update command. Something
> like: UpdateAction->MyMerge->Merged working copy + updated base.
> I know also how to do the first part (create a merged working copy), but
> not how to say that my working copy us up to date.
> Could someone clarify me on this subject please?

To do this, you would have to hack the working copy or learn the
necessary SVN API calls to do it the right way. You cannot do this
via Subclipse or even JavaHL You should probably ask on the
dev_at_subversion.tigris.org mailing list. What you are essentially
asking is how do I write my own update command or at least how do I
handle the merging process myself.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: dev-help_at_subclipse.tigris.org
Received on 2008-03-10 16:26:32 CET

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