[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: how to list all conflits into a huge dir struture

From: Kaz Kylheku
Subject: Re: how to list all conflits into a huge dir struture
Date: Sat, 05 Jan 2002 23:55:43 GMT
User-agent: slrn/ (Linux)

In article <address@hidden>, David D wrote:
>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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]