Re: [Subclipse-users] Re: Resolving conflict with quick fix
On 3/8/07, Per Arnold Blåsmo <email@example.com> wrote:
> Per Arnold Blåsmo <pablaasmo <at> atmel.com> writes:
> > I my case I wanted to choose accept their revision. I believe that this
> > mean that the file 'file.nn.merge-right.rXXXX' was chosen since
> > 'Edit Conflicts' names that file as 'their'.
> > But here is the error, Doing that chooses the 'file.nn.working'! Then
> > automatically resolves the conflict and removes the merge files and
> leaves the
> > chosen version of the file.
> Actually the command that subclipse seems to execute is:
> revert -N file.nn
> And that will throw away my local changes and leave the file like the last
> committed file. That means that if I had made some local changes that
> where not
> committed, the file ends up differently from all the files that I try to
> That have to be an error?
Would you please file an issue in the issue tracker so this does not get
forgotten? I remember when we added this feature, and yes the intent was to
do the revert, but I think that was due to a misunderstanding at the time on
my part at what the merge had done. I was thinking of the conflict in terms
of what happens when you do an update and it produces a conflict. In that
case, the base revision has been updated, so doing revert does in fact give
you the file you asked for. The problem is that when you have a conflict
from merge, this is not the case. So clearly, we need to fix this.
Received on Tue Mar 13 15:53:54 2007
This is an archived mail posted to the Subclipse Users