In article <a17t3h$2559$[EMAIL PROTECTED]>, David D wrote: >Hi, > >I have a project with many dir and with deep levels. >I have resolve some conflcts that I can see just in default dir. >I make a commit and he finds me other that I didn't see. >The commit took a lot of time, so I want to no longer forget eventual >conflits n correct them
After a merge, you should be looking at all files that have commitable changes, not just those that have conflicts. There can be problems that don't show up as conflicts; you never know. >before launching commit. > >SO if u have command to make this it will be great. How you do this is platform dependent. One way is to run the cvs status command and filter its output for specific features using a utility like grep. If you have a GUI front end for CVS, maybe it has some useful filters built in. In WinCVS, for instance, you can filter for files that have conflicts, and at the same time turn on ``flat mode'' to see entire file directories in a single list view. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
