equal
deleted
inserted
replaced
1619 fileMenuOpen |
1619 fileMenuOpen |
1620 |
1620 |
1621 | dlg info | |
1621 | dlg info | |
1622 dlg := OpenDialog new. |
1622 dlg := OpenDialog new. |
1623 info := LastDiffInfo. |
1623 info := LastDiffInfo. |
1624 info isNil ifTrue:[ |
1624 info isNil ifFalse:[ |
1625 info := ChangeSetDiffInfo new. |
1625 info := ChangeSetDiffInfo new. |
1626 info changeSetMergedSpec: ChangeSetSpec changeSet |
1626 info specMerge: ChangeSetSpec changeSet |
1627 ]. |
1627 ]. |
1628 dlg diffInfo: info. |
1628 dlg diffInfo: info. |
1629 dlg open ifFalse:[^self]. |
1629 dlg open ifFalse:[^self]. |
1630 info := dlg diffInfo. |
1630 info := dlg diffInfo. |
1631 |
1631 |
1632 ^self fileMenuOpenOnDiffInfo: info |
1632 ^self fileMenuOpenOnDiffInfo: info |
1633 |
1633 |
1634 "Modified: / 03-08-2012 / 15:37:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1634 "Modified: / 18-09-2012 / 11:37:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1635 ! |
1635 ! |
1636 |
1636 |
1637 fileMenuOpenOnDiffInfo: info |
1637 fileMenuOpenOnDiffInfo: info |
1638 |
1638 |
1639 LastDiffInfo := info. |
1639 LastDiffInfo := info. |
2741 version_CVS |
2741 version_CVS |
2742 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2742 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2743 ! |
2743 ! |
2744 |
2744 |
2745 version_SVN |
2745 version_SVN |
2746 ^ '$Id: Tools__ChangeSetDiffTool.st 8037 2012-08-10 16:54:01Z vranyj1 $' |
2746 ^ '$Id: Tools__ChangeSetDiffTool.st 8057 2012-09-18 10:39:12Z vranyj1 $' |
2747 ! ! |
2747 ! ! |