[Pharo-project] Merge tool. No way to cherry pick the changes?
stephane.ducasse at inria.fr
Tue Jun 21 10:11:30 EDT 2011
we should improve that aspect
First would be to resurrect the install menu and behavior.
On Jun 21, 2011, at 4:04 PM, Guillermo Polito wrote:
> Yeap, preety annoying. It's annoying too that you can't do any kind of filter (for example, to not show the ones marked as "revision changed"). Merging Glorp was kind of a mess :).
> On Tue, Jun 21, 2011 at 11:00 AM, Adrian Lienhard <adi at netstyle.ch> wrote:
> I'm missing that too.
> In previous versions, IIRC, there was a menu item for changed methods named "Install".
> On Jun 21, 2011, at 14:37 , Igor Stasenko wrote:
> > I don't understand, when i merging, the merge tool showing me all the
> > difference between current version and
> > incoming one.
> > It says '0 conflicts' and its ok to merge, but what if i want to
> > choose to keep an old version for some methods, while merge the rest?
> > What i see that there is no way to do that .. all menu items which
> > would allow me to do that, like
> > 'keep current version'
> > 'use incoming verison'
> > 'mark as conflict'
> > are disabled.
> > Which means that once machine decided that there is no conflict, you
> > cannot do much.
> > I tried to quickly hack the UI and enable those menu items , but it
> > doesn't works, because the model itself seems like don't supports
> > that.
> > So, the question is how we can change that? As to me, it is certainly
> > a missing feature, if i cannot freely choose between current and
> > incoming version at
> > my will, when merging.
> > Gary (& all)? Any ideas?
> > --
> > Best regards,
> > Igor Stasenko AKA sig.
More information about the Pharo-dev