Re: conflicts-130 fails - more info

2001-04-04 Thread Larry Jones
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

Re: conflicts-130 fails - more info

2001-04-04 Thread Pavel Roskin
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

Merge conflict?

2001-04-04 Thread Jacob Burckhardt
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