Re: [Pharo-project] Monticello diff between chosen revisionsisbroken

Jan. 28, 2010


      It is on the "wish list"... has been for some time now. Having had a look in light of recent thread I believe it will be possible.

Regards, Gary

  ----- Original Message ----- 
  From: Mariano Martinez Peck 
  To: Pharo-project@lists.gforge.inria.fr 
  Sent: Tuesday, January 26, 2010 12:40 PM
  Subject: Re: [Pharo-project] Monticello diff between chosen revisionsisbroken


  On Tue, Jan 26, 2010 at 8:58 AM, StÃ©phane Ducasse <stephane.ducasse@inria.fr> wrote:

    gary what would be great is to have a label on top of the two methods shown
    I never now what I'm reading

           Incoming                                        InWorkingCopy
           New                                             Current

    would be so great!


  And if you do it also in the merge, it would be a dream  :)
   
    Stef


    On Jan 25, 2010, at 7:25 PM, Gary Chambers wrote:

    > Yes, in this case it is a bug with Polymorph.
    >
    > Try with
    >
    > MCVersionInspector>>changes
    >  "Open a patch morph for the changes."
    >
    >  self viewChanges: self version changes
    >
    >
    > Hopefully no bad side-effects...
    >
    > With a bit more work it may be possible to show both versions between which the changes apply (unlike the old MC tools) ;-)
    >
    > Regards, Gary
    > ----- Original Message -----
    > From: Gary Chambers
    > To: Pharo-project@lists.gforge.inria.fr
    > Sent: Monday, January 25, 2010 6:05 PM
    > Subject: Re: [Pharo-project] Monticello diff between chosen revisionsisbroken
    >
    >
    > MCVersionInspector>>diff
    >  | ancestorVersion |
    >  self pickAncestor ifNotNil:
    >   [:ancestor |
    >   ancestorVersion := self version workingCopy repositoryGroup versionWithInfo: ancestor.
    >   (self version asDiffAgainst: ancestorVersion) open]
    >
    >
    > Regards, Gary
    > ----- Original Message -----
    > From: Gary Chambers
    > To: Pharo-project@lists.gforge.inria.fr
    > Sent: Monday, January 25, 2010 5:50 PM
    > Subject: Re: [Pharo-project] Monticello diff between chosen revisionsisbroken
    >
    > Needs looking at since it is confusing. IIRC the Diff button creates a .mcd file of the changes between some versions...
    >
    > Regards, Gary
    > ----- Original Message -----
    > From: Mariano Martinez Peck
    > To: Pharo-project@lists.gforge.inria.fr
    > Sent: Monday, January 25, 2010 5:34 PM
    > Subject: Re: [Pharo-project] Monticello diff between chosen revisionsisbroken
    >
    >
    >
    > 2010/1/25 Gary Chambers <gazzaguru2@btinternet.com>
    > The "Diff" button on the Monticello repository browser does what its balloon help says...
    >
    >  'Create an equivalent version based on an earlier release'. This is a diff version. I never use them as they can be confusing :-)
    >
    >
    > Ok...I never used before...but something is clear: the second ask about a version, has no sense, and even is wrong if it compares to the last version. See step 6 of Stefan. Then, we have to options:
    >
    > - Or we remove that second prompt, as it always will use the last version
    > - Or we change the diff implementation so that it uses the selected version instead of the last.
    >
    > What do you think ?
    >
    > Does someone really know what this "diff" should do ?
    >
    > Cheers
    >
    > Mariano
    >
    > If you want to compare two existing versions you should:
    >
    > 1. Open Monticello Browser
    > 2. Select a repo
    > 3. click open
    > 4. Select a revision, not the latest one
    > 5. Click HISTORY
    >
    > 6. chose an ancestor from the list
    >
    >
    > Regards, Gary
    > ----- Original Message -----
    > From: Mariano Martinez Peck
    > To: Pharo-project@lists.gforge.inria.fr
    > Cc: Lukas Renggli
    > Sent: Sunday, January 24, 2010 12:59 PM
    > Subject: Re: [Pharo-project] Monticello diff between chosen revisions isbroken
    >
    >
    >
    > On Sat, Jan 23, 2010 at 9:51 PM, Stefan Marr <pharo@stefan-marr.de> wrote:
    > Hi:
    >
    > In the current dev image (10508), Monticello is broken with respect to showing the differences of between chosen revisions.
    >
    > However, that seems to be broken already in 10496. (and maybe earlier)
    >
    > To reproduce:
    >
    > 1. Open Monticello Browser
    > 2. Select a repo
    > 3. click open
    > 4. Select a revision, not the latest one
    > 5. Click diff
    > 6. chose an ancestor from the list
    > Now you got a window 'Version:  ...5'
    > Saying (Diff against ...2)
    > Here I would expect the changes button to open a window showing the changes between the chosen revisions, but it always diffs against the latest version.
    >
    >
    > Yes, I could reproduce the problem. Can you open a ticket ?
    >
    > Maybe Lukas Monticello guru can help us ? hahaha
    >
    > Cheers
    >
    > Mariano
    >
    >
    > Best
    > Stefan
    >
    > --
    > Stefan Marr
    > Software Languages Lab
    > Vrije Universiteit Brussel
    > Pleinlaan 2 / B-1050 Brussels / Belgium
    > http://soft.vub.ac.be/~smarr
    > Phone: +32 2 629 3956
    > Fax:   +32 2 629 3525
    >
    >
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
    >
    >
    >
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
    >
    >
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
    >
    >
    >
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
    >
    >
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
    >
    >
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
    > _______________________________________________
    > Pharo-project mailing list
    > Pharo-project@lists.gforge.inria.fr
    > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project


    _______________________________________________
    Pharo-project mailing list
    Pharo-project@lists.gforge.inria.fr
    http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project


------------------------------------------------------------------------------


  _______________________________________________
  Pharo-project mailing list
  Pharo-project@lists.gforge.inria.fr
  http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project