Tools TestSuiteDifferenceBrowser/en - Versionsgeschichte

Cg: /* Merging two GIT Versions */

2024-12-19T14:25:56Z

Merging two GIT Versions

← Nächstältere Version		Version vom 19. Dezember 2024, 14:25 Uhr
Zeile 108:		Zeile 108:
	* actions which have been modified by both users will be shown In the middle: these require manual interaction and cannot be merged automatically.		* actions which have been modified by both users will be shown In the middle: these require manual interaction and cannot be merged automatically.

			=== Single Element Comparison ===
			When comparing two items from the tree (via the "''Compare with each other''" tree menu function),
			only the 3 bottom panes (as shown in the above screenshot) are shown: the diff-list, the left and the right element view.

	Back to [[Online_Documentation#Tools \| Online Documentation]].		Back to [[Online_Documentation#Tools \| Online Documentation]].

Cg: /* Single Element Comparison */

2024-12-19T14:25:01Z

Single Element Comparison

← Nächstältere Version		Version vom 19. Dezember 2024, 14:25 Uhr
Zeile 12:		Zeile 12:
	* compare two individual tree-elements (such as two blocks) using the "''More''" → "''Compare with each other''" tree menu function (when two action blocks are selected).		* compare two individual tree-elements (such as two blocks) using the "''More''" → "''Compare with each other''" tree menu function (when two action blocks are selected).
	* resolve merge conflicts in [[GIT Plugin/en \| GIT]]		* resolve merge conflicts in [[GIT Plugin/en \| GIT]]

	=== Single Element Comparison ===
	When comparing two items from the tree (via the "''Compare with each other''" tree menu function),
	only 3 panes are shown: the diff-list, the left and the right element view.

	=== Workflow ===		=== Workflow ===

Cg: /* Overview */

2024-12-19T14:24:39Z

Overview

← Nächstältere Version		Version vom 19. Dezember 2024, 14:24 Uhr
Zeile 10:		Zeile 10:
	* compare individual items of the project against corresponding items in a file,<br>select them in the tree, and choose "''Contextmenu''" → "''More''" → "''Compare with Version in File...''".<p></p>		* compare individual items of the project against corresponding items in a file,<br>select them in the tree, and choose "''Contextmenu''" → "''More''" → "''Compare with Version in File...''".<p></p>
	* compare two files containing test suites,<br>select "''Extras''" → "''Tools''" → "''Compare two Testsuite Files...''" in the main menu.<p></p>		* compare two files containing test suites,<br>select "''Extras''" → "''Tools''" → "''Compare two Testsuite Files...''" in the main menu.<p></p>
	* compare two individual tree-elements (such as two blocks) using the "''More''" →"''Compare with each other''" tree menu function (when two action blocks are selected).		* compare two individual tree-elements (such as two blocks) using the "''More''" → "''Compare with each other''" tree menu function (when two action blocks are selected).
	* resolve merge conflicts in [[GIT Plugin/en \| GIT]]		* resolve merge conflicts in [[GIT Plugin/en \| GIT]]

			=== Single Element Comparison ===
			When comparing two items from the tree (via the "''Compare with each other''" tree menu function),
			only 3 panes are shown: the diff-list, the left and the right element view.

	=== Workflow ===		=== Workflow ===

Cg: /* Workflow */

2024-12-19T14:21:27Z

Workflow

← Nächstältere Version		Version vom 19. Dezember 2024, 14:21 Uhr
Zeile 21:		Zeile 21:

	However, by exchanging the left and right projects, it is possible to merge changes from the browser's version into a file version.		However, by exchanging the left and right projects, it is possible to merge changes from the browser's version into a file version.
	It is also possible to load two file versions as left and right versions and merging without the ~~rowser~~'s project being involved (see more on these two modes of operation below).		It is also possible to load two file versions as left and right versions and merging without the browser's project being involved (see more on these two modes of operation below).

	Changes are applied semi-automatically: for elements which are only present in the right version, these can be automatically adopted.		Changes are applied semi-automatically: for elements which are only present in the right version, these can be automatically adopted.

Cg: /* Overview */

2024-12-19T14:20:20Z

Overview

← Nächstältere Version		Version vom 19. Dezember 2024, 14:20 Uhr
Zeile 10:		Zeile 10:
	* compare individual items of the project against corresponding items in a file,<br>select them in the tree, and choose "''Contextmenu''" → "''More''" → "''Compare with Version in File...''".<p></p>		* compare individual items of the project against corresponding items in a file,<br>select them in the tree, and choose "''Contextmenu''" → "''More''" → "''Compare with Version in File...''".<p></p>
	* compare two files containing test suites,<br>select "''Extras''" → "''Tools''" → "''Compare two Testsuite Files...''" in the main menu.<p></p>		* compare two files containing test suites,<br>select "''Extras''" → "''Tools''" → "''Compare two Testsuite Files...''" in the main menu.<p></p>
	* compare two individual tree-elements (such as two blocks) using the "''Compare with each other''" tree menu function.		* compare two individual tree-elements (such as two blocks) using the "''More''" →"''Compare with each other''" tree menu function (when two action blocks are selected).
	* resolve merge conflicts in [[GIT Plugin/en \| GIT]]		* resolve merge conflicts in [[GIT Plugin/en \| GIT]]

Cg: /* Overview */

2024-12-19T14:19:30Z

Overview

← Nächstältere Version		Version vom 19. Dezember 2024, 14:19 Uhr
Zeile 7:		Zeile 7:

	* compare the edited project against a file/expecco ALM version,<br>select the project item (the root item in the left tree) and choose "''Contextmenu''" → "''Compare with Version in File...''" (that menu item is also found in the "''Extras''" → "''Tools''" menu)<p></p>		* compare the edited project against a file/expecco ALM version,<br>select the project item (the root item in the left tree) and choose "''Contextmenu''" → "''Compare with Version in File...''" (that menu item is also found in the "''Extras''" → "''Tools''" menu)<p></p>
	* compare the edited project against a version in a version management system,<br>choose "''Plugins/Extensions''" → "''Tools''" → "''Productivity''" → "''CVS / GIT''" → ''Compare with Version...''" <p></p>		* compare the edited project against a version in a version management system,<br>choose "''Plugins/Extensions''" → "''Tools''" → "''Productivity''" → "''CVS / GIT''" → "''Compare with Version...''" <p></p>
	* compare individual items of the project against corresponding items in a file,<br>select them in the tree, and choose "''Contextmenu''" → "''More''" → "''Compare with Version in File...''".<p></p>		* compare individual items of the project against corresponding items in a file,<br>select them in the tree, and choose "''Contextmenu''" → "''More''" → "''Compare with Version in File...''".<p></p>
	* compare two files containing test suites,<br>select "''Extras''" → "''Tools''" → "''Compare two Testsuite Files...''" in the main menu.<p></p>		* compare two files containing test suites,<br>select "''Extras''" → "''Tools''" → "''Compare two Testsuite Files...''" in the main menu.<p></p>

Cg: /* Overview */

2024-12-19T14:19:05Z

Overview

← Nächstältere Version		Version vom 19. Dezember 2024, 14:19 Uhr
Zeile 1:		Zeile 1:
	=== Overview ===		=== Overview ===
			This tool finds and shows differences between two elements or between complete test suites.
	~~This tool finds differences between two test suites and~~ is also used to merge changes from another suite into the current ~~edited~~ suite. This may be either the differences between the edited project and another version in a file, or the expecco ALM repository, or a version in a source code repository, or between two suites in files.		It is also used to merge changes from another suite into the current suite. This may be either the differences between the edited project and another version in a file, the expecco ALM repository, a version in a source code repository, or between two suites in files.
	The [[GIT Plugin/en \| GIT plugin]] and ~~others~~ also open this tool for merge operations.		The [[GIT Plugin/en \| GIT plugin]] and other source code versioning plugins also open this tool for compare and merge operations.

	The tool is opened to:		The tool is opened to:

Cg: /* Merging two File/s into a Single File */

2023-11-20T10:11:17Z

Merging two File/s into a Single File

← Nächstältere Version		Version vom 20. November 2023, 10:11 Uhr
Zeile 89:		Zeile 89:

	=== Merging two File/s into a Single File ===		=== Merging two File/s into a Single File ===
	Open the tool via "''Extras''" -> "''Compare & Repair''" -> "''Compare Two TestSuite Files''". Select the two files in the upcoming file dialogs.		Open the tool via "''Extras''" → "''Compare & Repair''" → "''Compare Two TestSuite Files''". Select the two files in the upcoming file dialogs.
	Merge them as usual.		Merge them as usual.
	Use the tool's file menu to save the left version into a new file, or open a browser on the merged left version (to check if everything works).		Use the tool's file menu to save the left version into a new file, or open a browser on the merged left version (to check if everything works).

Cg: /* Merging Changes from the File/Repository Version into the Current Project */

2023-11-20T10:10:42Z

Merging Changes from the File/Repository Version into the Current Project

← Nächstältere Version		Version vom 20. November 2023, 10:10 Uhr
Zeile 87:		Zeile 87:
	This tool is meant for interactive use;		This tool is meant for interactive use;
	for an automatic generation of diff-lists between two versions of a test suite (for example, to automatically generate comment-text for a version management system like CVS, SVN, Mercurial or Git), use the [[Command_Line_Options/en#Utility_Functions\|"--diff" command line option]].		for an automatic generation of diff-lists between two versions of a test suite (for example, to automatically generate comment-text for a version management system like CVS, SVN, Mercurial or Git), use the [[Command_Line_Options/en#Utility_Functions\|"--diff" command line option]].

			=== Merging two File/s into a Single File ===
			Open the tool via "''Extras''" -> "''Compare & Repair''" -> "''Compare Two TestSuite Files''". Select the two files in the upcoming file dialogs.
			Merge them as usual.
			Use the tool's file menu to save the left version into a new file, or open a browser on the merged left version (to check if everything works).

	=== Merging two GIT Versions ===		=== Merging two GIT Versions ===

Cg: /* Workflow */

2023-11-20T10:06:02Z

Workflow

← Nächstältere Version		Version vom 20. November 2023, 10:06 Uhr
Zeile 25:		Zeile 25:

	For elements which are different, the item must be selected and adoption explicitly triggered via the "''Adopt Item''" button.		For elements which are different, the item must be selected and adoption explicitly triggered via the "''Adopt Item''" button.

	Be reminded, that ''adoption'' always takes the version shown on the right side into the project shown on the left side. Typically, items are ''adopted'' as a whole (i.e. if there are multiple differences such as new pins, new steps or new connections, all of them will be applied to the left project's item).		Be reminded, that ''adoption'' always takes the version shown on the right side into the project shown on the left side. Typically, items are ''adopted'' as a whole (i.e. if there are multiple differences such as new pins, new steps or new connections, all of them will be applied to the left project's item).
	<br>However, for simple attribute changes, which have no side effects (such as pin comments), these may also be adopted individually. For those, an "''Adopt Value''" button will be made visible.		<br>However, for simple attribute changes, which have no side effects (such as pin comments), these may also be adopted individually. For those, an "''Adopt Value''" button will be made visible.