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

Re: [Subclipse-users] Merge Results Help

From: Mark Phippard <markphip_at_gmail.com>
Date: Sat, 27 Feb 2010 10:44:49 -0500

It really should not even show that second time. It just does
sometimes based on the way the merge events are parsed but it is
technically a bug. So the answer is that it is not trying to show you
anything specifically.

On Fri, Feb 26, 2010 at 5:03 PM, Greg Creager <greg.creager_at_hp.com> wrote:
> I am confused by the merge results display. I always have the 'working copy' folder listed in blue, which I would expect as a change in merge info.
> But what confuses me is that you can expand it and it only shows a limited amount of changes.
> For example (See attachment), the merge result here shows my working copy directory as a blue folder (dfe_ui_svn-test), I am assuming it is showing because it has a change in the mergeinfo.
> But I am confused as to why it also lists build.xml under this area (it is also listed just as a merge result) why is this file under this area (and in the other) but not readme.txt or other changes?
> Just dont understand what this part is trying to inform me.
> any help is much appreciated.

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-02-27 16:44:59 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.