Re: CVS Merge, No Conflict

[Jim Hyslop]

Abhishek_Sharma04 wrote:
> Hi,
>
> I found a bug while merging a file and wanted to know if there is some problem 
> with the way we perform merging or it's an inherent CVS bug.
> The CVS version we are currently using is 1.11.17.
>
> We first thought that we did some mistake while merge and didn't observe the 
> confict. But we were able to reproduce the same scenario again.

I'm sorry, but your diagram got messed up and I couldn't follow your 
verbal description. Can you please post a sequence of commands that 
reproduces the behaviour you're observing?

--
Jim