Hi
One of the developers in our project reported a
problem.He commited a file after fixing a bug as
revision number 1.115.Later some one commited another
revision of the same file(1.116).Now the first
developer updated his copy from the rep and ran the
program and noticed the same bug and after
Paddy T writes:
One of the developers in our project reported a
problem.He commited a file after fixing a bug as
revision number 1.115.Later some one commited another
revision of the same file(1.116).Now the first
developer updated his copy from the rep and ran the
program and noticed the
Most likely what happened was this:
- Users A and B updated to version 1.114.
- User A modified and committed the file, creating version 1.115.
- User B modified the file, but his commit was blocked.
- User B did a "cvs update".
- User B decided not to complete the merge, and renamed his backup
