On Sun, Jun 29, 2008 at 6:49 PM, Joe <qbproger_at_gmail.com> wrote:
> I took out most of my original post so this didn't get extremely long.
>
> On Sun, Jun 29, 2008 at 6:24 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> ...
>>
>> You should try the CollabNet merge client which is built atop
>> Subclipse. I will be adding info on this to the Subclipse web site in
>> the coming weeks. Here is some info:
>>
>> http://www.collab.net/community/integrations/articles/merge.html
>>
>
> I tried the merge in the new Tortoise client, and I'm already
> impressed with that. I doubt I'll switch, but may give it a shot when
> it gets added to the subclipse site.
FWIW, TortoiseSVN modeled their merge wizard after what we did. And
we in turn picked up some of the things we liked in their
interpretation and put them back into ours. Where our merge client
goes beyond TortoiseSVN is assisting you in the post-merge process.
The CollabNet client will not be posted to the Subclipse site. Links
and information will be posted. The CollabNet merge client is EPL
licensed.
>> The logic behind it is that for most people, most of the time, they
>> want to commit/revert everything in the dialog. The check boxes
>> confuse the UI for the normal case. You can right-click to remove
>> items. The UI for this dialog was modeled after the CVS dialogs in
>> Eclipse, which have been like this for many years now. I looked for
>> bug reports where people complained but could not find any. So we
>> went with it. I blogged about this a year ago when we added it.
>>
>> http://markphip.blogspot.com/2007/09/new-subclipse-build-posted-dialog.html
>>
>> We are going to make an enhancement for 1.4.1 where there is a single
>> checkbox in the dialog to show/hide unversioned items. It remembers
>> your last setting. The checkbox only appears when there are
>> unversioned items, which hopefully makes it more obvious.
>>
>
> 1.4.1 will probably be better for me then. I have several unversioned
> files, and removing them ALL every commit will get annoying. I want
> to see them though because I usually look through them to see if I
> forgot anything that is supposed to be committed. I'm not definitely
> going to do this, but I may use TortoiseSVN for commits. I'm very used
> to the checkboxes dialog. I like being able to right-click and add an
> unversioned file in the dialog, and everything that is unversioned
> isn't committed by default. An option to choose between the two
> dialog styles would be great, but I understand this probably isn't
> feasible.
I do not think our change will really help your scenario that much.
You'd have to make the dialog show all unversioned items, and then
selectively remove the items you do not want.
A workflow you might want to look into is to work from the Synchronize
view. Especially if you use the feature to group changes into change
sets this makes it real easy to only see the files you care about in
the dialog.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-06-30 01:16:21 CEST