On 7/26/07, Scott Cytacki <scott@concord.org> wrote:
> Mark Phippard wrote:
> > On 7/26/07, Alexander Shatalin <Alexander.Shatalin@borland.com> wrote:
> >> Subclipse eclipse client (1.2.2) Steps to repeat:
> >>
> >> - Invoke Team/Synchronize with Repository action
> >> - If there are any Conflicts in "Synchronize" view click "Update" ->
> >> conflicting file marked as "file with outgoing changes", 3 additional
> >> "added" files created: *.mine, *.rXXX, *.xYYY
> >>
> >> I expect to see original file marked as "Conflicting" and not see
> >> additional 3 files at all in this view.
> >>
> >> I'm posting this bug report here in accordance with the guidelines.
> >> Please let me know if I can submit a bug tracker issue for this problem.
> >
> > You can file an enhancement, but I do not see how it can be done. We
> > rely on the informartion Subversion tells us about a file. If it said
> > these were ignored, we would not show them. It says they are
> > unversioned. OK, so suppose we can develop a routine to discover if
> > they are really these merge files that people do not want to see. We
> > would then have to run that routine every time Subversion tells us a
> > file is unversioned to make sure it was telling us the truth. The
> > feature might not be worth the performance hit.
>
> Couldn't this routine be conditional on there being a file marked with a
> "conflict" in the directory?
> The update that creates the extra files prints that there is a conflict
> in the subclipse svn. That info could be used to trigger the search for
> the extra files.
But from the context of a single file you do not know that. You are
right that this is what the routine would have to do, but there would
be no way to short-circuit the routine.
> Wouldn't it be good anyhow for subclipse to know about these files so it
> could use them when showing diffs in the synch view?
Subclipse does know about them and does use them. Take the Edit
Conflicts action. The problem is that we only know about them from
the context of the file that has the conflicts.
> The svn status on the command line does report the file as a conflict,
> but subclipse synch view does not.
This is a limitation of the Synchronize view. It does not allow for
the concept of a working copy conflict. It has its own definition of
conflict that has a different meaning.
> Doing an svn diff on the command line is smart and does a difference
> between the .mine file and head.
> In the synchronize view with subclipse, looking at a diff, shows the
> differences between the "diff output file" and head.
We provide the Edit Conflicts option for a file with conflicts to do a
3-way merge.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Jul 26 14:26:12 2007