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

[Subclipse-dev] [PATCH] conflict view update after save - take II

From: Paul Lorenz <plorenz_at_gmail.com>
Date: 2006-01-31 05:39:47 CET

On 1/30/06, Mark Phippard <markp@softlanding.com> wrote:
> Paul Lorenz <plorenz@gmail.com> wrote on 01/30/2006 09:47:16 AM:
> > Sure. After doing a merge or an update which results in a conflict,
> > you can bring up the eclipse compare editor with Edit Conflicts. The
> > way I have worked with this editor in the past is first pull in all
> > non-conflicting changes, then hit save. This will save my changes to
> > disk and redo the compare, so that all those conflicts vanish from the
> > view. Then I continue going merge by merge, saving every once in a
> > while to refresh the view and remove any conflicts I've resolved.
> >
> > What I observed with subversion was that after I did the first save,
> > the compare wouldn't update, i.e. any conflicts I had resolved would
> > still show up. Secondly, the copy change buttons wouldn't work any
> > more. So if I clicked copy current change to right pane, nothing would
> > happen.
> >
> > I looked at the CVS CompareInput and it uses the DiffNode.fireChanges
> > in save to force the compare to be redone, so I ported somethign
> > similar over.
> >
> > Let me know if you need more detail, or if you aren't observing the
> > same behavior, pre-patch, that I am. Maybe something is messed up on
> > my end.
> At first, I did not think the patch was working. What I discovered is
> that pressing the Save toolbar button does what you say. But,
> right-clicking within the left-side file and choosing Save does not. I
> also think it is because that option is not actually saving the file as it
> is still marked dirty and if you close without a second save it does not
> seem to actually be saved.
> Can you take a look at that? I did not try the keyboard shortcut, but it
> ought to be tested too.

Attached is a patch which fixes the right-click->Save on the left pane
behaviour. The implementation is based off the CVS one. I tested using
Ctl-S, right click-Save, the toolbar Save button and the File->Save
and all appeared to work as expected.

The patch included my earlier changes.

Let me know how it looks.


To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: dev-help@subclipse.tigris.org

Received on Tue Jan 31 05:39:56 2006

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