Revert problematic commit
20c458d9ab23
Actions

Authored by mreeves on Feb 2 2019, 4:39 AM.

Description

Revert problematic commit

Revert "use QSharedPointer for TotalDiffStatusInsure that
TotalDiffStatus object does not get distroyed while it isstill needed."

This reverts commit b4980131b5d59e0be6739a2fbed86dac096d67cc.
This reverts commit 2d4d6218a80a8c35b868ec3c2a69d8f914a8bdf4.

BUG: 403799
FIXED-IN:1.7.95

unbreak full anyalisis

Details

Committed

mreeves

Feb 2 2019, 5:57 AM

Parents

R983:6628499518fd: GIT_SILENT made messages (after extraction)

Branches

Unknown

Tags

Unknown

Reverts

R983:2d4d6218a80a: use QSharedPointer for TotalDiffStatusInsure that TotalDiffStatus object does…
R983:b4980131b5d5: Fix diff status handling.

mreeves committed R983:20c458d9ab23: Revert problematic commit (authored by mreeves).Feb 2 2019, 5:57 AM

mreeves added reverted changes: R983:b4980131b5d5: Fix diff status handling., R983:2d4d6218a80a: use QSharedPointer for TotalDiffStatusInsure that TotalDiffStatus object does….Feb 2 2019, 5:59 AM

Changes (9)

				Path	Packages
	M			src/MergeFileInfos.h
	M			src/directorymergewindow.cpp
	M			src/directorymergewindow.h
	M			src/kdiff3.cpp
	M			src/kdiff3.h
	M			src/kdiff3_part.cpp
	M			src/mergeresultwindow.cpp
	M			src/mergeresultwindow.h
	M			src/pdiff.cpp

R983:20c458d9ab23

View Options

src/MergeFileInfos.h

View Options

src/directorymergewindow.cpp

View Options

src/directorymergewindow.h

View Options

src/kdiff3.cpp

View Options

src/kdiff3.h

View Options

src/kdiff3_part.cpp

View Options

src/mergeresultwindow.cpp

View Options

src/mergeresultwindow.h

View Options

Revert problematic commit20c458d9ab23Actions

Description

Details

Changes (9)

R983:20c458d9ab23

src/MergeFileInfos.h

src/directorymergewindow.cpp

src/directorymergewindow.h

src/kdiff3.cpp

src/kdiff3.h

src/kdiff3_part.cpp

src/mergeresultwindow.cpp

src/mergeresultwindow.h

src/pdiff.cpp

Revert problematic commit
20c458d9ab23
Actions