Pavel Roskin writes:
Another fix would be to require CVS to sort some lists. This time it's a
list of unknown files.
That's the right thing to do. CVS already sorts file and directory
lists to avoid this kind of problem, but it looks like ignore_files ()
was overlooked. I've changed the
Hello, Larry!
Another fix would be to require CVS to sort some lists. This time it's a
list of unknown files.
That's the right thing to do. CVS already sorts file and directory
lists to avoid this kind of problem, but it looks like ignore_files ()
was overlooked. I've changed the code
Jacob Burckhardt writes:
Tristan Juricek writes:
I'm getting a merge conflict when merging files that only have lines
deleted from the branch to the main repository.
...
I'm wondering if anyone else has seen this behavior.
It sounds like it might be the same bug for which one of