Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some source code files is filled with comments like: "Unmerged change from project " #1451

Closed
moh-hassan opened this issue Dec 22, 2023 · 0 comments · Fixed by #1499
Closed
Assignees

Comments

@moh-hassan
Copy link

moh-hassan commented Dec 22, 2023

I found the main branch has some source files like this and this and many others.

These files have comments which may be added by external analysis tools like `dotnet format' or visual studio cleanup.
The comment is like:

/* Unmerged change from project 'Moq(net6.0)'
                        Before:
                                private Mock<T> mock;
                        After:
                                Mock<T> mock;
                        */

It seems these changes are addede in the commit Apply formatting

The complete list of files(134 file) are:

Click to expand! Processing: 242 files Found files: 134 of 242 files

src\Moq\ActionObserver.cs
Found: 12 matches
src\Moq\AsInterface.cs
Found: 6 matches
src\Moq\Behavior.cs
Found: 3 matches
src\Moq\CaptureMatch.cs
Found: 6 matches
src\Moq\Condition.cs
Found: 6 matches
src\Moq\DefaultExpressionCompiler.cs
Found: 6 matches
src\Moq\EmptyDefaultValueProvider.cs
Found: 18 matches
src\Moq\Evaluator.cs
Found: 18 matches
src\Moq\EventHandlerCollection.cs
Found: 9 matches
src\Moq\Expectation.cs
Found: 3 matches
src\Moq\ExpressionComparer.cs
Found: 72 matches
src\Moq\ExpressionCompiler.cs
Found: 3 matches
src\Moq\ExpressionExtensions.cs
Found: 6 matches
src\Moq\ExpressionReconstructor.cs
Found: 6 matches
src\Moq\Extensions.cs
Found: 6 matches
src\Moq\IMatcher.cs
Found: 3 matches
src\Moq\ImmutablePopOnlyStack.cs
Found: 9 matches
src\Moq\InnerMockSetup.cs
Found: 6 matches
src\Moq\Invocation.cs
Found: 9 matches
src\Moq\InvocationCollection.cs
Found: 12 matches
src\Moq\It.cs
Found: 3 matches
src\Moq\LookupOrFallbackDefaultValueProvider.cs
Found: 6 matches
src\Moq\Match.cs
Found: 15 matches
src\Moq\MatcherFactory.cs
Found: 3 matches
src\Moq\MatcherObserver.cs
Found: 12 matches
src\Moq\MatchExpression.cs
Found: 3 matches
src\Moq\MethodCall.cs
Found: 18 matches
src\Moq\MethodExpectation.cs
Found: 24 matches
src\Moq\MethodSetup.cs
Found: 3 matches
src\Moq\Mock.cs
Found: 15 matches
src\Moq\MockDefaultValueProvider.cs
Found: 3 matches
src\Moq\MockException.cs
Found: 6 matches
src\Moq\MockSequence.cs
Found: 3 matches
src\Moq\Mock1.cs Found: 18 matches src\Moq\Pair.cs Found: 3 matches src\Moq\ParameterTypes.cs Found: 6 matches src\Moq\ReturnsExtensions.cs Found: 18 matches src\Moq\SequenceSetup.cs Found: 6 matches src\Moq\Setup.cs Found: 9 matches src\Moq\SetupCollection.cs Found: 9 matches src\Moq\SetupWithOutParameterSupport.cs Found: 12 matches src\Moq\StringBuilderExtensions.AppendExpression.cs Found: 48 matches src\Moq\StringBuilderExtensions.cs Found: 3 matches src\Moq\StubbedPropertiesSetup.cs Found: 12 matches src\Moq\StubbedPropertySetup.cs Found: 12 matches src\Moq\Times.cs Found: 9 matches src\Moq\TypeMatcherAttribute.cs Found: 3 matches src\Moq\Async\Awaitable.cs Found: 3 matches src\Moq\Async\AwaitableFactory.cs Found: 9 matches src\Moq\Async\AwaitableFactory1.cs
Found: 3 matches
src\Moq\Async\AwaitableFactory2.cs Found: 3 matches src\Moq\Async\AwaitExpression.cs Found: 6 matches src\Moq\Async\IAwaitableFactory.cs Found: 3 matches src\Moq\Async\TaskFactory.cs Found: 6 matches src\Moq\Async\TaskFactory1.cs
Found: 3 matches
src\Moq\Async\ValueTaskFactory.cs
Found: 6 matches
src\Moq\Async\ValueTaskFactory`1.cs
Found: 3 matches
src\Moq\Behaviors\Callback.cs
Found: 6 matches
src\Moq\Behaviors\NoOp.cs
Found: 6 matches
src\Moq\Behaviors\RaiseEvent.cs
Found: 6 matches
src\Moq\Behaviors\ReturnBase.cs
Found: 6 matches
src\Moq\Behaviors\ReturnBaseOrDefaultValue.cs
Found: 6 matches
src\Moq\Behaviors\ReturnComputedValue.cs
Found: 6 matches
src\Moq\Behaviors\ReturnValue.cs
Found: 6 matches
src\Moq\Behaviors\ThrowComputedException.cs
Found: 6 matches
src\Moq\Behaviors\ThrowException.cs
Found: 6 matches
src\Moq\Behaviors\VerifyInvocationCount.cs
Found: 6 matches
src\Moq\Expressions\Visitors\ConstructorCallVisitor.cs
Found: 6 matches
src\Moq\Expressions\Visitors\EvaluateCaptures.cs
Found: 6 matches
src\Moq\Expressions\Visitors\UpgradePropertyAccessorMethods.cs
Found: 6 matches
src\Moq\Interception\CastleProxyFactory.cs
Found: 29 matches
src\Moq\Interception\IInterceptor.cs
Found: 3 matches
src\Moq\Interception\InterceptionAspects.cs
Found: 36 matches
src\Moq\Interception\InterfaceProxy.cs
Found: 9 matches
src\Moq\Interception\ProxyFactory.cs
Found: 3 matches
src\Moq\Language\Flow\NonVoidSetupPhrase.cs
Found: 3 matches
src\Moq\Language\Flow\SetterSetupPhrase.cs
Found: 3 matches
src\Moq\Language\Flow\SetupPhrase.cs
Found: 6 matches
src\Moq\Language\Flow\SetupSequencePhrase.cs
Found: 9 matches
src\Moq\Language\Flow\VoidSetupPhrase.cs
Found: 3 matches
src\Moq\Language\Flow\WhenPhrase.cs
Found: 6 matches
src\Moq\Linq\MockQuery.cs
Found: 6 matches
src\Moq\Linq\MockRepository.cs
Found: 3 matches
src\Moq\Linq\Mocks.cs
Found: 3 matches
src\Moq\Linq\MockSetupsBuilder.cs
Found: 21 matches
src\Moq\Matchers\AnyMatcher.cs
Found: 6 matches
src\Moq\Matchers\ConstantMatcher.cs
Found: 9 matches
src\Moq\Matchers\ExpressionMatcher.cs
Found: 6 matches
src\Moq\Matchers\LazyEvalMatcher.cs
Found: 6 matches
src\Moq\Matchers\MatcherAttributeMatcher.cs
Found: 9 matches
src\Moq\Matchers\ParamArrayMatcher.cs
Found: 9 matches
src\Moq\Matchers\RefMatcher.cs
Found: 6 matches
src\Moq\Obsolete\MockFactory.cs
Found: 3 matches
src\Moq\Protected\ProtectedAsMock.cs
Found: 36 matches
src\Moq.Tests\ActionObserverFixture.cs
Found: 6 matches
src\Moq.Tests\AfterReturnCallbackDelegateValidationFixture.cs
Found: 1 matches
src\Moq.Tests\CallbackDelegateValidationFixture.cs
Found: 1 matches
src\Moq.Tests\CallbacksFixture.cs
Found: 1 matches
src\Moq.Tests\CSharpCompilerExpressionsFixture.cs
Found: 4 matches
src\Moq.Tests\CustomDefaultValueProviderFixture.cs
Found: 2 matches
src\Moq.Tests\CustomTypeMatchersFixture.cs
Found: 2 matches
src\Moq.Tests\DefaultValueProviderFixture.cs
Found: 3 matches
src\Moq.Tests\Demo.cs
Found: 2 matches
src\Moq.Tests\EmptyDefaultValueProviderFixture.cs
Found: 1 matches
src\Moq.Tests\ExpressionExtensionsFixture.cs
Found: 5 matches
src\Moq.Tests\ExpressionSplitFixture.cs
Found: 8 matches
src\Moq.Tests\ExtensibilityFixture.cs
Found: 2 matches
src\Moq.Tests\ExtensionsFixture.cs
Found: 1 matches
src\Moq.Tests\InterceptorFixture.cs
Found: 3 matches
src\Moq.Tests\LookupOrFallbackDefaultValueProviderFixture.cs
Found: 2 matches
src\Moq.Tests\MatcherAttributeFixture.cs
Found: 3 matches
src\Moq.Tests\MatcherObserverFixture.cs
Found: 1 matches
src\Moq.Tests\MatchersFixture.cs
Found: 1 matches
src\Moq.Tests\MatchExpressionFixture.cs
Found: 4 matches
src\Moq.Tests\MatchFixture.cs
Found: 2 matches
src\Moq.Tests\MethodExpectationFixture.cs
Found: 1 matches
src\Moq.Tests\MockBehaviorFixture.cs
Found: 1 matches
src\Moq.Tests\MockDefaultValueProviderFixture.cs
Found: 1 matches
src\Moq.Tests\MockedDelegatesFixture.cs
Found: 4 matches
src\Moq.Tests\MockedEventsFixture.cs
Found: 2 matches
src\Moq.Tests\MockFixture.cs
Found: 3 matches
src\Moq.Tests\OccurrenceFixture.cs
Found: 1 matches
src\Moq.Tests\ProtectedAsMockFixture.cs
Found: 4 matches
src\Moq.Tests\ProtectedMockFixture.cs
Found: 1 matches
src\Moq.Tests\ReturnsDelegateValidationFixture.cs
Found: 1 matches
src\Moq.Tests\ReturnsValidationFixture.cs
Found: 1 matches
src\Moq.Tests\SetupTaskResultFixture.cs
Found: 3 matches
src\Moq.Tests\StringBuilderExtensionsFixture.cs
Found: 1 matches
src\Moq.Tests\StubExtensionsFixture.cs
Found: 1 matches
src\Moq.Tests\VerifiableSetupFixture.cs
Found: 1 matches
src\Moq.Tests\Linq\MockRepositoryQuerying.cs
Found: 2 matches
src\Moq.Tests\Matchers\AnyMatcherFixture.cs
Found: 1 matches
src\Moq.Tests\Matchers\ParamArrayMatcherFixture.cs
Found: 1 matches
src\Moq.Tests\Regressions\IssueReportsFixture.cs
Found: 30 matches

If you want , I can remove all these comments from the source files in a safe way in a new commit and provide PR.

@github-actions github-actions bot added the stale label Aug 24, 2024
@kzu kzu self-assigned this Aug 24, 2024
@devlooped devlooped deleted a comment from github-actions bot Aug 24, 2024
@kzu kzu added tech debt and removed stale labels Aug 24, 2024
@kzu kzu closed this as completed in 191422a Aug 24, 2024
@kzu kzu closed this as completed in #1499 Aug 24, 2024
@devlooped devlooped locked and limited conversation to collaborators Sep 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants