Found Bug in Merge/Branch scenario?

[Uwe Laemmle]

Found Bug?

After merging branches the following problem was raised:


Original:

static void Main(string[] args)
{
//
// TODO: Fügen Sie hier Code hinzu, um die Anwendung zu starten
//
Console.WriteLine("Test1");
Console.WriteLine("ein neues Codefragment");
Console.Read();
}


Branch:
static void Main(string[] args)
{
//
// TODO: Fügen Sie hier Code hinzu, um die Anwendung zu starten
//
Console.WriteLine("Hallo Welt");
Console.Read();
}

After Merge with leave everything and always click next and ok. At least resolve Merge status.

Result:

static void Main(string[] args)
{
//
// TODO: Fügen Sie hier Code hinzu, um die Anwendung zu starten
//
Console.WriteLine("Hallo Welt");
Console.WriteLine("ein neues Codefragment");//??????????
Console.WriteLine("ein neues Codefragment");
Console.Read();
}


In the Central Panel of the merge it was shown correctly


Thanks

Uwe

[dan]

Can you elaborate on what the bug is? Is it that the file was merged when you don't think it should have been, or that you believe the merge was done incorrectly?

[Uwe Laemmle]

please see the screenshot of the CenterPanel during merge operation, but the result itself shows the wrong content.

[lbauer]

We're still a little unclear on the problem.

Are you saying that the merge result in the diff tool is correct, but the content of the merged file was different than the merge result?

[Uwe Laemmle]

yes, exactly (Sourcegear V3.06)

[lbauer]

It looks like the merge added this line:

Console.WriteLine("ein neues Codefragment");//??????????

Is that correct?

We'd like to try to reproduce this. We'd need a copy of the file at the point it was branched, plus a copy of the "original" and "target" that are show in your merge windows.

Email them to Linda at sourcegear.com

[Uwe Laemmle]

Hello,

Yes, this is correct. The Line was added twice, but in the Preview it was not added. I just made this test and press every time next and ok to see what is happening.

I put all versions of the files in the zip.


Best regards

[lbauer]

We tried to reproduce this with the files you sent, but couldn't. Of course there may be other factors that we don't have in our environment.

But let us know if you continue to experience these kinds of merge errors on different files.