Diff tools
Locked
 
|
New version on SqueakSource Polymorph-Tools-Diff-gvc.20. Descriptions added and small bug fix for merge tool (selecting next conflict now ignores "resolved" conflicts). Merge and select incoming for each conflict to load.. Regards, Gary
_______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
2010/2/9 GARY CHAMBERS <[hidden email]>
Excelent!!! Thanks Gary. Can I add something to the wishlist ? What I would REALLY like too be able to edit code of the working copy in the merge view. can that be done easily ? Thanks Mariano
_______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
Not easy but some groundwork has already been done
for that.
Getting MC to use the modified code is another
matter!
Regards, Gary
_______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
2010/2/10 Gary Chambers <[hidden email]>
cool :)
hahahah good point. I was just thinking in the working copy, not in MC :P
_______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
In reply to this post by Gary Chambers-4
gary
do we have resolved all conflict by taking the incoming? and the inverse because in the old diff tools we could and this is handy. On Feb 9, 2010, at 4:24 PM, GARY CHAMBERS wrote: > New version on SqueakSource Polymorph-Tools-Diff-gvc.20. > > Descriptions added and small bug fix for merge tool (selecting next conflict now ignores "resolved" conflicts). > > Merge and select incoming for each conflict to load.. > > Regards, Gary > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
If you can describe exactly what you wish I'm sure it can be done ;-) ...
Remember, conflicts are conflicts and *should* be checked on a one-by-one basis when merging. Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <[hidden email]> To: <[hidden email]> Sent: Thursday, February 11, 2010 7:57 AM Subject: Re: [Pharo-project] Diff tools > gary > do we have resolved all conflict by taking the incoming? > and the inverse because in the old diff tools we could and this is handy. > > On Feb 9, 2010, at 4:24 PM, GARY CHAMBERS wrote: > >> New version on SqueakSource Polymorph-Tools-Diff-gvc.20. >> >> Descriptions added and small bug fix for merge tool (selecting next >> conflict now ignores "resolved" conflicts). >> >> Merge and select incoming for each conflict to load.. >> >> Regards, Gary >> _______________________________________________ >> Pharo-project mailing list >> [hidden email] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
Gary
sometimes I know (since for example I already checked all the conflicts but the system crashes for another reason) that I want to take all the incoming versions or the working copy ones. Right now I have to go over the list each time (even if I know what I'm doing). in the old merge there was such buttons. Stef On Feb 23, 2010, at 4:40 PM, Gary Chambers wrote: > If you can describe exactly what you wish I'm sure it can be done ;-) ... > Remember, conflicts are conflicts and *should* be checked on a one-by-one > basis when merging. > > Regards, Gary > > ----- Original Message ----- > From: "Stéphane Ducasse" <[hidden email]> > To: <[hidden email]> > Sent: Thursday, February 11, 2010 7:57 AM > Subject: Re: [Pharo-project] Diff tools > > >> gary >> do we have resolved all conflict by taking the incoming? >> and the inverse because in the old diff tools we could and this is handy. >> >> On Feb 9, 2010, at 4:24 PM, GARY CHAMBERS wrote: >> >>> New version on SqueakSource Polymorph-Tools-Diff-gvc.20. >>> >>> Descriptions added and small bug fix for merge tool (selecting next >>> conflict now ignores "resolved" conflicts). >>> >>> Merge and select incoming for each conflict to load.. >>> >>> Regards, Gary >>> _______________________________________________ >>> Pharo-project mailing list >>> [hidden email] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> >> _______________________________________________ >> Pharo-project mailing list >> [hidden email] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
I'll give it a go (keyboard shortcuts included) in the next DiffTools
version... I guess you won't want a warning dialog the "What you are choosing means that any conflicts will be unchecked"... ;-) So, "use incoming for all incoming conficts" and "use current for all conflicts"? Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <[hidden email]> To: <[hidden email]> Sent: Tuesday, February 23, 2010 5:47 PM Subject: Re: [Pharo-project] Diff tools Gary sometimes I know (since for example I already checked all the conflicts but the system crashes for another reason) that I want to take all the incoming versions or the working copy ones. Right now I have to go over the list each time (even if I know what I'm doing). in the old merge there was such buttons. Stef On Feb 23, 2010, at 4:40 PM, Gary Chambers wrote: > If you can describe exactly what you wish I'm sure it can be done ;-) ... > Remember, conflicts are conflicts and *should* be checked on a one-by-one > basis when merging. > > Regards, Gary > > ----- Original Message ----- > From: "Stéphane Ducasse" <[hidden email]> > To: <[hidden email]> > Sent: Thursday, February 11, 2010 7:57 AM > Subject: Re: [Pharo-project] Diff tools > > >> gary >> do we have resolved all conflict by taking the incoming? >> and the inverse because in the old diff tools we could and this is handy. >> >> On Feb 9, 2010, at 4:24 PM, GARY CHAMBERS wrote: >> >>> New version on SqueakSource Polymorph-Tools-Diff-gvc.20. >>> >>> Descriptions added and small bug fix for merge tool (selecting next >>> conflict now ignores "resolved" conflicts). >>> >>> Merge and select incoming for each conflict to load.. >>> >>> Regards, Gary >>> _______________________________________________ >>> Pharo-project mailing list >>> [hidden email] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> >> _______________________________________________ >> Pharo-project mailing list >> [hidden email] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > [hidden email] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
On Feb 23, 2010, at 7:04 PM, Gary Chambers wrote: > I'll give it a go (keyboard shortcuts included) in the next DiffTools > version... > I guess you won't want a warning dialog the "What you are choosing means > that any conflicts will be unchecked"... ;-) :) > So, "use incoming for all incoming conficts" and "use current for all > conflicts"? Yeap! _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
|
|
Done in Polymorph-Tools-Diff-gvc.23 on SqueakSource/UIEnhancements, includes (from version 22) keyboard shortcuts for existing menu items. From: Stéphane Ducasse <[hidden email]> To: [hidden email] Sent: Tuesday, 23 February, 2010 19:06:04 Subject: Re: [Pharo-project] Diff tools On Feb 23, 2010, at 7:04 PM, Gary Chambers wrote: > I'll give it a go (keyboard shortcuts included) in the next DiffTools > version... > I guess you won't want a warning dialog the "What you are choosing means > that any conflicts will be unchecked"... ;-) :) > So, "use incoming for all incoming conficts" and "use current for all > conflicts"? Yeap! _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [hidden email] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project |
«
Return to Pharo Smalltalk Developers
|
1 view|%1 views
| Free forum by Nabble | Edit this page |