In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing.
If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. What causes the differences between the listings? Thx for any insight, Ken G. Brown |
On Mon, 21 Feb 2011, Ken G. Brown wrote:
> In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing. > > If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. > > What causes the differences between the listings? Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B. Levente > > Thx for any insight, > Ken G. Brown > > |
Ken, from my iPhone On 2011-02-21, at 22:40, Levente Uzonyi <[hidden email]> wrote: > On Mon, 21 Feb 2011, Ken G. Brown wrote: > >> In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing. >> >> If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. >> >> What causes the differences between the listings? > > Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B. So it looks like to me that all the changes to transform A to B are not available for reject or keep. How do you selectively reject some of those changes that are not visible in the merge? Thx, Ken > Levente > >> >> Thx for any insight, >> Ken G. Brown >> >> > |
On Mon, 21 Feb 2011, Ken G. Brown wrote:
> > > Ken, > from my iPhone > > On 2011-02-21, at 22:40, Levente Uzonyi <[hidden email]> wrote: > >> On Mon, 21 Feb 2011, Ken G. Brown wrote: >> >>> In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing. >>> >>> If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. >>> >>> What causes the differences between the listings? >> >> Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B. > > So it looks like to me that all the changes to transform A to B are not available for reject or keep. How do you selectively reject some of those changes that are not visible in the merge? You can't decide about non-conflicting differences when merging, because it wants to give you A+B, not A+B-whatYouDontWant. Levente > > Thx, > Ken > > >> Levente >> >>> >>> Thx for any insight, >>> Ken G. Brown >>> >>> >> > > |
At 7:12 AM +0100 2/22/11, Levente Uzonyi apparently wrote:
>On Mon, 21 Feb 2011, Ken G. Brown wrote: > >> >> >>Ken, >>from my iPhone >> >>On 2011-02-21, at 22:40, Levente Uzonyi <[hidden email]> wrote: >> >>>On Mon, 21 Feb 2011, Ken G. Brown wrote: >>> >>>>In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing. >>>> >>>>If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. >>>> >>>>What causes the differences between the listings? >>> >>>Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B. >> >>So it looks like to me that all the changes to transform A to B are not available for reject or keep. How do you selectively reject some of those changes that are not visible in the merge? > >You can't decide about non-conflicting differences when merging, because it wants to give you A+B, not A+B-whatYouDontWant. > Seems like that capability is missing and a potential source of confusion. When looking at the merge listing, you do not have all the information of what is going to be done, nor control over it. How do you deal with that sort of thing where you want A+B-somethingsThatAren'tListed Ken >Levente > >> >>Thx, >>Ken >> >>>Levente >>> >>>> >>>>Thx for any insight, >>>>Ken G. Brown |
On Mon, 21 Feb 2011, Ken G. Brown wrote:
> At 7:12 AM +0100 2/22/11, Levente Uzonyi apparently wrote: >> On Mon, 21 Feb 2011, Ken G. Brown wrote: >> >>> >>> >>> Ken, >>> from my iPhone >>> >>> On 2011-02-21, at 22:40, Levente Uzonyi <[hidden email]> wrote: >>> >>>> On Mon, 21 Feb 2011, Ken G. Brown wrote: >>>> >>>>> In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing. >>>>> >>>>> If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. >>>>> >>>>> What causes the differences between the listings? >>>> >>>> Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B. >>> >>> So it looks like to me that all the changes to transform A to B are not available for reject or keep. How do you selectively reject some of those changes that are not visible in the merge? >> >> You can't decide about non-conflicting differences when merging, because it wants to give you A+B, not A+B-whatYouDontWant. >> > > > Seems like that capability is missing and a potential source of confusion. When looking at the merge listing, you do not have all the information of what is going to be done, nor control over it. How do you deal with that sort of thing where you want A+B-somethingsThatAren'tListed You see all changes that will be done, but you can't decide about changes that don't cause conflicts. Levente > > Ken > >> Levente >> >>> >>> Thx, >>> Ken >>> >>>> Levente >>>> >>>>> >>>>> Thx for any insight, >>>>> Ken G. Brown > > > |
At 8:01 AM +0100 2/22/11, Levente Uzonyi apparently wrote:
>On Mon, 21 Feb 2011, Ken G. Brown wrote: > >>At 7:12 AM +0100 2/22/11, Levente Uzonyi apparently wrote: >>>On Mon, 21 Feb 2011, Ken G. Brown wrote: >>> >>>> >>>> >>>>Ken, >>>>from my iPhone >>>> >>>>On 2011-02-21, at 22:40, Levente Uzonyi <[hidden email]> wrote: >>>> >>>>>On Mon, 21 Feb 2011, Ken G. Brown wrote: >>>>> >>>>>>In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in 'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing. >>>>>> >>>>>>If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes. >>>>>> >>>>>>What causes the differences between the listings? >>>>> >>>>>Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B. >>>> >>>>So it looks like to me that all the changes to transform A to B are not available for reject or keep. How do you selectively reject some of those changes that are not visible in the merge? >>> >>>You can't decide about non-conflicting differences when merging, because it wants to give you A+B, not A+B-whatYouDontWant. >>> >> >> >>Seems like that capability is missing and a potential source of confusion. When looking at the merge listing, you do not have all the information of what is going to be done, nor control over it. How do you deal with that sort of thing where you want A+B-somethingsThatAren'tListed > >You see all changes that will be done, but you can't decide about changes that don't cause conflicts. So in the case I was looking at, there were a bunch of removals that got done that I temporarily did not want done, but I had no control. What would you do in that case? Ken > >Levente > >> >>Ken >> >>>Levente >>> >>>> >>>>Thx, >>>>Ken >>>> >>>>>Levente >>>>> >>>>>> >>>>>>Thx for any insight, >>>>>>Ken G. Brown |
In reply to this post by Levente Uzonyi-2
On Mon, Feb 21, 2011 at 11:22 PM, Ken G. Brown <[hidden email]> wrote:
> So in the case I was looking at, there were a bunch of removals that got done that I temporarily did not want done, but I had no control. > What would you do in that case? One other factor here is whether you have a clean load of version A, or do you have changes that you haven't saved yet? Colin |
Free forum by Nabble | Edit this page |