summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
AgeCommit message (Collapse)Author
2007-06-30Sync revisions and time buffers size to be consistent with each others.Xavier Santolaria
Simplifies further size tweaks if needed. OK ray@.
2007-02-27As done in OpenCVS, general includes cleanup sweep. OK otto@.Xavier Santolaria
2006-10-12- convert some warnx() to warn(), which fixes a few stupidly un-informative ↵Niall O'Higgins
error messages (found by tom@) - make rcs_choosefile() save wrt errno, input from ray@ ok joris@ xsa@
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
OK niallo@
2006-05-27Remove rcs_statfile(). It was just a wrapper for rcs_choosefile(),Ray Lai
handling exceptions oddly. OK joris@
2006-05-14warnx(); return(); --> errx();Xavier Santolaria
2006-05-10treat first file passed as argument only; issue a warning for others.Xavier Santolaria
matches gnu/usr.bin/rcs. OK joris@.
2006-05-09move -e to compat land; pointed out by rayJason McIntyre
ok xsa
2006-05-09Remove /* NOTREACHED */ comments, now that lint is smart aboutRay Lai
__dead. I never should have put them there. OK xsa@.
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
do our operations on that, this is safe and guarantees we can operate on the file until we close(2) it. a fix is coming for the remaining races in our diff code. okay niallo@ and ray@
2006-04-26fork our code we shared between openrcs/cvs into the openrcs dir.Joris Vink
this was starting to become inhuman to maintain without ugly ugly hacks in the shared code, and it will be easier to make specific changes for openrcs without touching the soon-to-be-replaced opencvs code.
2006-04-25fatal() -> err()/errx() as we try to not depend on heavy cvs_log().Xavier Santolaria
OK joriski.
2006-04-25The -r flag without an argument signifies HEAD for rcsmerge as well.Ray Lai
OK joris@
2006-04-24- move -A into compat landJason McIntyre
- tweak -E description accordingly ok xsa
2006-04-24-r is not optional: simplify its synopsis, but improve its description;Jason McIntyre
ok xsa
2006-04-24be consistent in error messages for wrongly specified keyword substitutionXavier Santolaria
mode for `-k'.
2006-04-21move shared functions into rcsutil.[ch]; this makes rcsprog.c cleaner;Xavier Santolaria
"the voices in my head say OK!" joris@.
2006-04-21remove overkill cvs_log() and rather use warn()/warnx().Xavier Santolaria
OK ray@ and discussed with joris@.
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
``crazy'' joris@
2006-04-13*** empty log message ***Ray Lai
2006-04-12Clean up <rev> handling. Whenever a revision is specified after aRay Lai
flag, it calls one of two new functions: rcs_setrevstr() or rcs_setrevstr2(). rcs_setrevstr() sets a string to another string, and complains if it was set more than once. rcs_setrevstr2() takes two strings, sets one after the other, and fatal()s if more than two strings were given. All <rev> handling is now done in the loop that goes through each argv. This is necessary for parsing symbols, which will be much easier after this. Along the way a lot of memory leaks were cleaned up. There is one area where rcs_set_rev() is called, which allocates a RCSNUM and stores it in pb.newrev, but it segfaults whenever I try to rcsnum_free() it. I put an /* XXX */ comment there for now. Passes regression tests and the code is less complicated in some ways (to me). Suggestions and OK xsa@
2006-03-24Allow the -x flag to be used without an extension.Ray Lai
``that makes sense'' xsa@
2006-03-23- cvs_buf_putc() will never return non-zeroXavier Santolaria
- change cvs_buf_putc() return type to void OK ray@.
2006-03-16Follow exit() with /* NOTREACHED*/ for lint.Ray Lai
``OK niallo@'' niallo@
2006-03-14add an argument to cvs_diff3() to be able to handle verbosity ofXavier Santolaria
commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
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
update usage() whilst here...
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
for the specified file. Fix some error messages while there. OK joris@
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
time ago, but we were being held back by jfb. too bad for him. next step is to use fatal() through out the code for unrecoverable errors instead of trying to be all nice and fluffy and reach main() again. ok niallo@ and xsa@
2005-11-28sync usage() for `-xsuffixes';Xavier Santolaria
2005-11-21enable `-xsuffixes' support as it has been added a few days agoXavier Santolaria
in rcs_statfile(); niallo ok
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