hg/stx-libtool: Tools__ChangeSetDiffInfo.st@0e02e5ca25cd (annotated)

12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	1	"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	2	COPYRIGHT (c) 2006 by eXept Software AG
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	3	All Rights Reserved
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	4
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	5	This software is furnished under a license and may be used
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	6	only in accordance with the terms of that license and with the
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	7	inclusion of the above copyright notice. This software may not
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	8	be provided or otherwise made available to, or used by, any
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	9	other person. No title to or ownership of the software is
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	10	hereby transferred.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	11	"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	12	"{ Package: 'stx:libtool' }"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	13
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	14	"{ NameSpace: Tools }"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	15
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	16	Object subclass:#ChangeSetDiffInfo
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	17	instanceVariableNames:'specBase specA specB specMerge diffset same'
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	18	classVariableNames:''
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	19	poolDictionaries:''
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	20	category:'Interface-Diff'
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	21	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	22
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	23	!ChangeSetDiffInfo class methodsFor:'documentation'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	24
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	25	copyright
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	26	"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	27	COPYRIGHT (c) 2006 by eXept Software AG
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	28	All Rights Reserved
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	29
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	30	This software is furnished under a license and may be used
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	31	only in accordance with the terms of that license and with the
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	32	inclusion of the above copyright notice. This software may not
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	33	be provided or otherwise made available to, or used by, any
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	34	other person. No title to or ownership of the software is
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	35	hereby transferred.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	36	"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	37	! !
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	38
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	39	!ChangeSetDiffInfo class methodsFor:'instance creation'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	40
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	41	specA: specA specB: specB
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	42
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	43	^self specA: specA specB: specB specBase: nil
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	44
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	45	"Created: / 20-03-2012 / 11:17:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	46	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	47
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	48	specA: specA specB: specB specBase: specBase
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	49
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	50	^self specA: specA specB: specB specBase: specBase specMerge: nil
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	51
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	52	"Created: / 20-03-2012 / 11:19:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	53	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	54
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	55	specA: specA specB: specB specBase: specBase specMerge: specMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	56
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	57	^self new
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	58	specA: specA;
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	59	specB: specB;
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	60	specBase: specBase;
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	61	specMerge: specMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	62
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	63	"Created: / 20-03-2012 / 11:19:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	64	! !
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	65
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	66	!ChangeSetDiffInfo methodsFor:'accessing'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	67
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	68	diffset
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	69	^ diffset
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	70	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	71
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	72	same
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	73	^ same
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	74	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	75
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	76	specA
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	77	^ specA
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	78	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	79
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	80	specA:something
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	81	specA := something.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	82	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	83
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	84	specB
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	85	^ specB
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	86	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	87
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	88	specB:something
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	89	specB := something.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	90	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	91
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	92	specBase
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	93	^ specBase
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	94	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	95
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	96	specBase:something
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	97	specBase := something.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	98	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	99
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	100	specMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	101	^ specMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	102	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	103
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	104	specMerge:something
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	105	specMerge := something.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	106	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	107
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	108	specMergeFile
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	109	^ specMerge file
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	110
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	111	"Created: / 20-03-2012 / 15:04:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	112	! !
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	113
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	114	!ChangeSetDiffInfo methodsFor:'queries'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	115
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	116	isDiff2
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	117
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	118	^specBase isNil
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	119
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	120	"Created: / 20-03-2012 / 10:22:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	121	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	122
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	123	isDiff3
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	124
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	125	^specBase notNil
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	126
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	127	"Created: / 20-03-2012 / 10:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	128	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	129
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	130	isMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	131
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12201 diff changeset	132	^
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12201 diff changeset	133	"/ specBase notNil and:[
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12201 diff changeset	134	specMerge notNil
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12201 diff changeset	135	"/ ]
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	136
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	137	"Created: / 20-03-2012 / 10:23:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	138	! !
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	139
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	140	!ChangeSetDiffInfo methodsFor:'read / write'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	141
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	142	read
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	143	"Reads changesets and generates diffset and 'same' change list"
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	144
13673 0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	145	\| diff csA csB csBase \|
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	146	diff := ChangeSetDiff new.
13673 0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	147	ProgressNotification notify: 'Reading changes...' progress: nil.
0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	148	csA := specA changeSet.
0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	149	csB := specB changeSet.
0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	150	csBase := (specBase notNil ifTrue:[specBase changeSet] ifFalse:[nil]).
0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	151	ProgressNotification notify: 'Diffing...' progress: nil.
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	152	diff
13673 0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	153	versionA: csA
0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	154	versionB: csB
0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	155	versionBase: csBase.
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	156	diffset := diff diffset.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	157	same := diff same.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	158
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	159	"Created: / 19-03-2012 / 22:10:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
13673 0e02e5ca25cd Fixes in changeset diff browser. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12431 diff changeset	160	"Modified: / 11-11-2013 / 11:59:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	161	! !
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	162
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	163	!ChangeSetDiffInfo class methodsFor:'documentation'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	164
12431 9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	165	version_HG
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	166
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	167	^ '$Changeset: <not expanded> $'
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	168	!
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	169
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	170	version_SVN
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12201 diff changeset	171	^ '$Id: Tools__ChangeSetDiffInfo.st 8036 2012-08-03 15:14:04Z vranyj1 $'
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: diff changeset	172	! !
12431 9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	173

author	Jan Vrany <jan.vrany@fit.cvut.cz>
	Mon, 11 Nov 2013 13:38:07 +0000
branch	jv
changeset 13673	0e02e5ca25cd
parent 12431	9f0c59c742d5
child 15566	184cea584be5
permissions	-rw-r--r--