Issue 4439 in pharo: Allow cherry-picking when merging

Status: Accepted
Owner: [hidden email]
Labels: Importance-High Type-Feature

New issue 4439 by [hidden email]: Allow cherry-picking when merging
http://code.google.com/p/pharo/issues/detail?id=4439

Here the patch which would allow to cherry-pick changes when merging two  
different monticello snapshots.

In list of changes, when you right-click on selected item for context menu
there will be a new menu item, named 'Apply this change'
which can be toggled on or off,
and it means whether the selected change will be applied (an incoming  
version will be installed) or not (a current version will stay).

Items which won't be applied are listed with gray color (i wanted to use  
theme settings for 'disabled' color, but can't find anything appropriate in  
theme for this, so i just hardcoded a 'Color gray').

Attachments:
        cherry-picking.1.cs  3.5 KB


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Comment #1 on issue 4439 by [hidden email]: Allow cherry-picking  
when merging
http://code.google.com/p/pharo/issues/detail?id=4439

Color gray is consistent... would be nice to have some time for refactoring  
and standardisation of that!

I'll take a look at the changes when I get a moment free!


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Comment #2 on issue 4439 by [hidden email]: Allow cherry-picking when  
merging
http://code.google.com/p/pharo/issues/detail?id=4439

- added a shortcut 'Cmd-a' to toggle applying the change

Attachments:
        cherry-picking.2.cs  4.5 KB


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Comment #3 on issue 4439 by [hidden email]: Allow cherry-picking when  
merging
http://code.google.com/p/pharo/issues/detail?id=4439

btw, when you look at it, please also the the bug in diff viewer, which  
incorrectly highlights the difference, when only spaces are involved. See  
the attached image.

Attachments:
        Screen shot 2011-06-22 at 19.28.38 PM.png  22.9 KB


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Comment #4 on issue 4439 by [hidden email]: Allow cherry-picking  
when merging
http://code.google.com/p/pharo/issues/detail?id=4439

The *actual* diff looks ok to me... (spaces removed) thought the highlight  
positioning is not. Possibly due to text editor changes or font kerning...

Seems to be a cumulative effect also... maybe a scanner problem?


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Updates:
        Status: closed

Comment #5 on issue 4439 by [hidden email]: Allow cherry-picking  
when merging
http://code.google.com/p/pharo/issues/detail?id=4439

in 14009


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker