diff options
Diffstat (limited to 'contrib/cvs/src/status.c')
| -rw-r--r-- | contrib/cvs/src/status.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/contrib/cvs/src/status.c b/contrib/cvs/src/status.c index 2e2957e..7a828ae 100644 --- a/contrib/cvs/src/status.c +++ b/contrib/cvs/src/status.c @@ -1,6 +1,11 @@ /* - * Copyright (c) 1992, Brian Berliner and Jeff Polk - * Copyright (c) 1989-1992, Brian Berliner + * Copyright (C) 1986-2005 The Free Software Foundation, Inc. + * + * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>, + * and others. + * + * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk + * Portions Copyright (C) 1989-1992, Brian Berliner * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. @@ -141,9 +146,6 @@ status_fileproc (callerdat, finfo) sstat = "Needs Patch"; break; case T_CONFLICT: - /* I _think_ that "unresolved" is correct; that if it has - been resolved then the status will change. But I'm not - sure about that. */ sstat = "Unresolved Conflict"; break; case T_ADDED: @@ -153,9 +155,7 @@ status_fileproc (callerdat, finfo) sstat = "Locally Removed"; break; case T_MODIFIED: - if ( vers->ts_conflict - && ( file_has_conflict ( finfo, vers->ts_conflict ) - || file_has_markers ( finfo ) ) ) + if (file_has_markers (finfo)) sstat = "File had conflicts on merge"; else /* Note that we do not re Register() the file when we spot @@ -206,20 +206,15 @@ status_fileproc (callerdat, finfo) } else if (vers->vn_user[0] == '0' && vers->vn_user[1] == '\0') cvs_output (" Working revision:\tNew file!\n", 0); -#ifdef SERVER_SUPPORT - else if (server_active) - { - cvs_output (" Working revision:\t", 0); - cvs_output (vers->vn_user, 0); - cvs_output ("\n", 0); - } -#endif else { cvs_output (" Working revision:\t", 0); cvs_output (vers->vn_user, 0); - cvs_output ("\t", 0); - cvs_output (vers->ts_rcs, 0); + if (!server_active) + { + cvs_output ("\t", 0); + cvs_output (vers->ts_rcs, 0); + } cvs_output ("\n", 0); } |
