summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
AgeCommit message (Expand)Author
2006-10-12- convert some warnx() to warn(), which fixes a few stupidly un-informative e...Niall O'Higgins
2006-08-11correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.Xavier Santolaria
2006-08-01Reduce rcs_buf_release() usage, improving binary support.Ray Lai
2006-05-27Remove rcs_statfile(). It was just a wrapper for rcs_choosefile(),Ray Lai
2006-05-14warnx(); return(); --> errx();Xavier Santolaria
2006-05-10treat first file passed as argument only; issue a warning for others.Xavier Santolaria
2006-05-09move -e to compat land; pointed out by rayJason McIntyre
2006-05-09Remove /* NOTREACHED */ comments, now that lint is smart aboutRay Lai
2006-05-08properly handle exit code 1; OK ray@.Xavier Santolaria
2006-05-08correctly handle the `no input file' case.Xavier Santolaria
2006-05-08err() and errx() should also exit with status 2;Xavier Santolaria
2006-05-08exit with status 2 after usage() too; pointed out by uwe@.Xavier Santolaria
2006-04-26prevent file races by obtaining an fd for the RCS file andJoris Vink
2006-04-26fork our code we shared between openrcs/cvs into the openrcs dir.Joris Vink
2006-04-25fatal() -> err()/errx() as we try to not depend on heavy cvs_log().Xavier Santolaria
2006-04-25The -r flag without an argument signifies HEAD for rcsmerge as well.Ray Lai
2006-04-24- move -A into compat landJason McIntyre
2006-04-24-r is not optional: simplify its synopsis, but improve its description;Jason McIntyre
2006-04-24be consistent in error messages for wrongly specified keyword substitutionXavier Santolaria
2006-04-21move shared functions into rcsutil.[ch]; this makes rcsprog.c cleaner;Xavier Santolaria
2006-04-21remove overkill cvs_log() and rather use warn()/warnx().Xavier Santolaria
2006-04-21switch -p handling to bitwise flags; OK ray@.Xavier Santolaria
2006-04-19switch -q handling to bitwise flags; OK ray@ niallo@.Xavier Santolaria
2006-04-14Add missing usage() calls.Ray Lai
2006-04-13*** empty log message ***Ray Lai
2006-04-12Clean up <rev> handling. Whenever a revision is specified after aRay Lai
2006-03-24Allow the -x flag to be used without an extension.Ray Lai
2006-03-23- cvs_buf_putc() will never return non-zeroXavier Santolaria
2006-03-16Follow exit() with /* NOTREACHED*/ for lint.Ray Lai
2006-03-14add an argument to cvs_diff3() to be able to handle verbosity ofXavier Santolaria
2006-03-08fix usage();Xavier Santolaria
2006-03-08respect -q; pointed out by Ray Lai.Xavier Santolaria
2006-03-07-z support for RCS;Joris Vink
2006-03-06move compat flags into a STANDARDS section;Jason McIntyre
2006-03-06adapt informative message if we are sending output to stdout.Xavier Santolaria
2006-03-06if the submitted rev(s) is/are the same as the head rev, skip the processXavier Santolaria
2006-01-05cleanup, move log.h and rcs.h inclusion into rcsprog.h;Xavier Santolaria
2006-01-02#include's cleanup; ok joris@ niallo@.Xavier Santolaria
2005-12-10switch to xmalloc stuff, me and xsa@ agreed on this a longJoris Vink
2005-11-28sync usage() for `-xsuffixes';Xavier Santolaria
2005-11-21enable `-xsuffixes' support as it has been added a few days agoXavier Santolaria
2005-11-02print RCS file path;Xavier Santolaria
2005-11-02sync with Reality;Xavier Santolaria
2005-10-26diff3_conflicts cleanup; joris okXavier Santolaria
2005-10-23add extern int diff3_conflicts to unbreak. bad joris.Niall O'Higgins
2005-10-23correct error message;Xavier Santolaria
2005-10-23warn if conflicts were found during the merge;Joris Vink
2005-10-23with recent diff3 support, rcsmerge now works;Joris Vink
2005-10-18skeletons for rcsmerge(1);Xavier Santolaria
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 15:21:16 +0000