summaryrefslogtreecommitdiff
path: root/usr.bin/rcs
AgeCommit message (Expand)Author
2005-10-25nuke trailing whitespaces;Xavier Santolaria
2005-10-25-T here too;Xavier Santolaria
2005-10-25-T is kept for compatibility with other RCS commands here too;Xavier Santolaria
2005-10-25missed that in previous commit;Xavier Santolaria
2005-10-25put HISTORY section in the right place;Jason McIntyre
2005-10-24output tweaks;Xavier Santolaria
2005-10-24first bits for RCS intro; input/ok jmc, "fine" joris.Xavier Santolaria
2005-10-24.Xr rcsmerge(1);Xavier 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-22need util.c for diff3Joris Vink
2005-10-20+YFLAGS=Xavier Santolaria
2005-10-20fix output if -p is specified; joris okXavier Santolaria
2005-10-19sync usage();Xavier Santolaria
2005-10-19.Xr rcsmerge(1) + one style nitpick;Xavier Santolaria
2005-10-19- make a bunch of changes to how we handle verbose output. this brings usNiall O'Higgins
2005-10-19add co -p support;Joris Vink
2005-10-18more rcsmerge(1) bits;Xavier Santolaria
2005-10-18skeletons for rcsmerge(1);Xavier Santolaria
2005-10-18put -N description in the right place, and fix its description;Jason McIntyre
2005-10-18- `-N' works now; document it.Niall O'Higgins
2005-10-18- no point in using cvs_printf() in openrcs;Joris Vink
2005-10-18oops, rcs_set_rev() can't operate when str is NULL of course;Joris Vink
2005-10-18use rcs_set_rev() instead of duplicating code all over theJoris Vink
2005-10-18correctly handle locks when commiting something;Joris Vink
2005-10-17- remove a printf which kept in by accident.Niall O'Higgins
2005-10-17KNF;Niall O'Higgins
2005-10-17support -f flag for co;Joris Vink
2005-10-17-k takes an arg;Jason McIntyre
2005-10-17incorrect macro usage;Jason McIntyre
2005-10-16- remove the lock even if we are just reverting to the previousNiall O'Higgins
2005-10-16- sync checkin_usage();Niall O'Higgins
2005-10-16- document `-n' option.Niall O'Higgins
2005-10-16- add support for `-n<symbol>'Niall O'Higgins
2005-10-16spacing;Joris Vink
2005-10-16- sort rcs_getopt() string before i add more options.Niall O'Higgins
2005-10-16- sync rcsdiff_usage();Niall O'Higgins
2005-10-16- sync checkout_usage();Niall O'Higgins
2005-10-16- Use Ns macro to remove spaces in these manual pages too.Niall O'Higgins
2005-10-16- use Ns macro to remove spaces between options and their arguments,Niall O'Higgins
2005-10-16- zap an incorrect comment.Niall O'Higgins
2005-10-16- remove unused `flags' variable.Niall O'Higgins
2005-10-16- remove unused `rcsfile' parameter from checkin_getlogmsg()Niall O'Higgins
2005-10-16KNFNiall O'Higgins
2005-10-16remove obsolete comment;Xavier Santolaria
2005-10-16spacing;Joris Vink
2005-10-16fix off-by-one in RCSINIT code, noticed by niallo@Joris Vink
2005-10-15- use Ns macro to remove spaces between options and argumentsNiall O'Higgins