6 Sep
2002
6 Sep
'02
9:08 p.m.
Folks,
Up until a few days ago, I was able to do this:
# vim some/wine/file.c # cvs diff some/wine/file.c > file.diff # mail wine-patches@winehq.com < file.diff # sleep <until Alexandre commited the patch> # cvs up
At this point, CVS would figure out that the changes in file.c in my tree are the same as the ones on the server, will give a message to that effect, and update the file.
As of lately, this no longer happens: I get a big fat conflic for all the changes I submit! This is *very* annoying. Anyone knows how to fix this behaviour? Alexandre, are you doing anything different?
--
Dimi.