Re: Integrating Versions with DiffMerge for 3 way merges

2011-11-28 Thread Rick Fillion
Hi Chris,

Great post, I'm sure that'll help out a lot of people.

I'm currently the lead dev on Versions, so I figured I'd take a crack at 
answering the question of Why doesn't Black Pixel already have this in there?

The easy answer: we (Black Pixel) haven't done a release yet since getting 
these apps from Sofa.  I've got a bug fix release that's just about ready to 
roll out.  Give us a bit of time and we'll try to impress you. :)

That's not a very good answer though.  Since I never worked at Sofa, I can't 
give you a definitive answer for why this feature isn't present in Versions.  
My gut feeling is that because not all diff'ing apps support 3-way merge, it 
might be non-trivial to generalize that in a way that won't confuse users.  
Having one drop down for what diff tool would you like and another for what 
merge tool would you like for cases where the 3rd party diff tool doesn't 
support 3-way merge, well that's a little messy for the user.

The fact is, I don't know why this feature isn't currently present.  I'll take 
this as a feature request, and we'll see what we can do about that in a future 
version.

Cheers.

Rick Fillion
Black Pixel

On 2011-11-27, at 11:10 PM, Chris Ozeroff wrote:

 Hey everyone,
 
 For those of you interested in custom scripts for Versions, I created
 a simple app to make it easier to launch a 3-way merge in DiffMerge
 from Versions. See my blog post here:
 
 http://chrisnchris.wordpress.com/2011/11/22/3-way-merging-using-versions-and-diffmerge/
 
 And to Black Pixel: Why isn't 3-way merge integration with popular
 diff tools supported inside the app? Or did I miss where to set that?
 
 
 Cheers,
 
 Chris
 
 -- 
 You received this message because you are subscribed to the Google Groups 
 Versions group.
 To post to this group, send email to versions@googlegroups.com.
 To unsubscribe from this group, send email to 
 versions+unsubscr...@googlegroups.com.
 For more options, visit this group at 
 http://groups.google.com/group/versions?hl=en.
 

-- 
You received this message because you are subscribed to the Google Groups 
Versions group.
To post to this group, send email to versions@googlegroups.com.
To unsubscribe from this group, send email to 
versions+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en.



Re: Integrating Versions with DiffMerge for 3 way merges

2011-11-28 Thread Chris Ozeroff
Thanks, Rick!

It is true that having two drop-downs would be a little ugly, and
perhaps not in the Mac idiom of minimalist GUI design. However, I
think that would actually be the best short-term idea.

1. Some developers I know (few of them, admittedly) actually prefer
different tools for diffs vs. 3-way merges. Dual drop downs would
allow you to make that distinction easily.
2. The 3-way drop down could auto-populate with the selection from the
other drop-down. I envision a checkbox above the second drop down
saying something like Use same program for 3-way merges. When the
checkbox is on (the default), the second drop-down is greyed out and
not changeable, and it will auto-populate to whatever you select via
the first one. If the first one does not support 3-way merges, then
the dropdown should say that. Selected comparison tool does not
support 3-way merging or something.
3. It's still pretty easy and at least it's consistent with the
comparison approach.
4. Most users of tools like this are not average computer users, they
are programmers or at least power users, so the complexity is less
intimidating to them.


Cheers,

Chris


On Nov 28, 8:29 am, Rick Fillion r...@blackpixel.com wrote:
 Hi Chris,

 Great post, I'm sure that'll help out a lot of people.

 I'm currently the lead dev on Versions, so I figured I'd take a crack at 
 answering the question of Why doesn't Black Pixel already have this in 
 there?

 The easy answer: we (Black Pixel) haven't done a release yet since getting 
 these apps from Sofa.  I've got a bug fix release that's just about ready to 
 roll out.  Give us a bit of time and we'll try to impress you. :)

 That's not a very good answer though.  Since I never worked at Sofa, I can't 
 give you a definitive answer for why this feature isn't present in Versions.  
 My gut feeling is that because not all diff'ing apps support 3-way merge, it 
 might be non-trivial to generalize that in a way that won't confuse users.  
 Having one drop down for what diff tool would you like and another for 
 what merge tool would you like for cases where the 3rd party diff tool 
 doesn't support 3-way merge, well that's a little messy for the user.

 The fact is, I don't know why this feature isn't currently present.  I'll 
 take this as a feature request, and we'll see what we can do about that in a 
 future version.

 Cheers.

 Rick Fillion
 Black Pixel

 On 2011-11-27, at 11:10 PM, Chris Ozeroff wrote:







  Hey everyone,

  For those of you interested in custom scripts for Versions, I created
  a simple app to make it easier to launch a 3-way merge in DiffMerge
  from Versions. See my blog post here:

 http://chrisnchris.wordpress.com/2011/11/22/3-way-merging-using-versi...

  And to Black Pixel: Why isn't 3-way merge integration with popular
  diff tools supported inside the app? Or did I miss where to set that?

  Cheers,

  Chris

  --
  You received this message because you are subscribed to the Google Groups 
  Versions group.
  To post to this group, send email to versions@googlegroups.com.
  To unsubscribe from this group, send email to 
  versions+unsubscr...@googlegroups.com.
  For more options, visit this group 
  athttp://groups.google.com/group/versions?hl=en.

-- 
You received this message because you are subscribed to the Google Groups 
Versions group.
To post to this group, send email to versions@googlegroups.com.
To unsubscribe from this group, send email to 
versions+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en.