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

Re: [Subclipse-dev] [PATCH] conflict view update after save

From: Paul Lorenz <plorenz_at_gmail.com>
Date: 2006-01-30 15:47:16 CET

On 1/30/06, Mark Phippard <markp@softlanding.com> wrote:
> Paul Lorenz <plorenz@gmail.com> wrote on 01/27/2006 11:44:23 AM:
>
> > The first is when you are actually doing Edit Conflicts using the
> > built in editor, the diff state isn't recalculated after doing a save.
> > Also, the copy current change stops working after the save. I fixed
> > this, usually a similar method that the CVS plugin uses, by having a
> > subclass of DiffNode which we have the differencer use, and then
> > calling fireChanges on that in the save. Patch is attached.
> >
> > Please let me know if the patch looks acceptable, or if it needs work,
> > or if it's working as expected, and I'm just missing something.
>
> Could you maybe explain this one to me a bit more? I am not clear what
> the problem is, how to observe it, and then how your patch changes things.
> I did some testing before and after the patch and it is not obvious to me
> what is different.

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.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: dev-help@subclipse.tigris.org
Received on Mon Jan 30 15:48:00 2006

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