#
f9872b43 |
| 28-May-2006 |
joris <joris@openbsd.org> |
enable merging on update. if your file in your working copy has been modified by yourself and there is a newer revision we try and merge them together.
if the merge fails and has conflicts it will m
enable merging on update. if your file in your working copy has been modified by yourself and there is a newer revision we try and merge them together.
if the merge fails and has conflicts it will mark them inside the file, you will need to resolve these by hand first before you will be able to commit your modified file.
works transparent with gnu cvs, as it is suppose to.
show more ...
|
#
c1fe09b4 |
| 27-May-2006 |
joris <joris@openbsd.org> |
show which directory we are examining in our pre-commit checks.
|
#
1890abda |
| 27-May-2006 |
joris <joris@openbsd.org> |
allow commands to respect the -l flag, if the -l flag is specified certain commands will not recurse into directories.
at the same time introduce a method of specifying wether or not a command shoul
allow commands to respect the -l flag, if the -l flag is specified certain commands will not recurse into directories.
at the same time introduce a method of specifying wether or not a command should look in the repository for files.
show more ...
|
#
2a132f99 |
| 27-May-2006 |
joris <joris@openbsd.org> |
dont allow commit to continue if the file that is being commited needs to be updated or merged first.
|
#
d77e7b73 |
| 27-May-2006 |
joris <joris@openbsd.org> |
commiting removed files now works
|
#
3ad3fb45 |
| 27-May-2006 |
joris <joris@openbsd.org> |
commit the new opencvs code, i have been hacking on this for the past 2 weeks now and it should go in at the start of the hackathon so others can help out.
this code is a lot safer, smarter, faster
commit the new opencvs code, i have been hacking on this for the past 2 weeks now and it should go in at the start of the hackathon so others can help out.
this code is a lot safer, smarter, faster and best of all it is actually doing what it is suppose to do!
basic checkout, update, status, diff and commit are working in local mode only. there is no support for any remote setups now.
show more ...
|
#
d593696f |
| 14-Apr-2006 |
deraadt <deraadt@openbsd.org> |
remove a metric buttload of excessive () no binary change; ok ray
|
#
ec6ed1ab |
| 01-Apr-2006 |
joris <joris@openbsd.org> |
fix some bugs that lint discovered for us. ok niallo@
|
#
ca321df7 |
| 16-Mar-2006 |
xsa <xsa@openbsd.org> |
zap more unused variables.
|
#
ac41f80c |
| 02-Jan-2006 |
xsa <xsa@openbsd.org> |
#include's cleanup; ok joris@ niallo@.
|
#
7e393898 |
| 30-Dec-2005 |
joris <joris@openbsd.org> |
major cleanup of the functions handling the remote cvs protocol. makes the code a lot more readable and understandable.
ok xsa@ and niallo@
|
#
31f670fb |
| 22-Dec-2005 |
xsa <xsa@openbsd.org> |
cvs_rcs_getpath() cannot fail anymore;
|
#
5738039c |
| 21-Dec-2005 |
xsa <xsa@openbsd.org> |
cvs_logmsg_open() and cvs_logmsg_get() cannot fail anymore;
|
#
0450b43b |
| 10-Dec-2005 |
joris <joris@openbsd.org> |
switch to xmalloc stuff, me and xsa@ agreed on this a long 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 in
switch to xmalloc stuff, me and xsa@ agreed on this a long 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@
show more ...
|
#
246675ed |
| 27-Jul-2005 |
xsa <xsa@openbsd.org> |
use LP_NOTICE instead of LP_INFO where appropriate;
|
#
ff1f7a8e |
| 25-Jul-2005 |
xsa <xsa@openbsd.org> |
KNF;
|
#
5805c4b0 |
| 23-Jul-2005 |
joris <joris@openbsd.org> |
rewrite of the file code. the previous one was just a mess and not clean. this code is much cleaner, faster, and uses less memory overall.
tested by xsa@, brad@, Michael Knudsen, and myself. okay xs
rewrite of the file code. the previous one was just a mess and not clean. this code is much cleaner, faster, and uses less memory overall.
tested by xsa@, brad@, Michael Knudsen, and myself. okay xsa@
show more ...
|
#
a4c69cc6 |
| 23-Jul-2005 |
joris <joris@openbsd.org> |
correctly seperate added, modified and removed files for use in the construction of the log message in the editor.
ok jfb@
|
#
b904ba2e |
| 22-Jul-2005 |
joris <joris@openbsd.org> |
use the cf_name field of the CVSFILE struct instead of using the old CVS_FILE_NAME macro. This macro used to be nifty because of all the referencing for the names, but since we don't do that anymore
use the cf_name field of the CVSFILE struct instead of using the old CVS_FILE_NAME macro. This macro used to be nifty because of all the referencing for the names, but since we don't do that anymore and use cf_name directly... byebye CVS_FILE_NAME()
okay xsa@
show more ...
|
#
204d64e6 |
| 19-Jul-2005 |
joris <joris@openbsd.org> |
unbreak the commit command.
|
#
3f748f9f |
| 14-Jul-2005 |
xsa <xsa@openbsd.org> |
use cvs_rcs_getpath();
|
#
740595fc |
| 12-Jul-2005 |
xsa <xsa@openbsd.org> |
split this into cvs_commit_{remote,local}() functions; ok jfb@ (Yes, Yes he IS back!!)
|
#
029277dd |
| 07-Jul-2005 |
joris <joris@openbsd.org> |
remove trailing whitespaces
from deraadt@
|
#
9225b0ca |
| 31-May-2005 |
xsa <xsa@openbsd.org> |
headers ordering (alphabetically) and cleanup, from mbalmer@ and myself;
|
#
a591b030 |
| 30-May-2005 |
joris <joris@openbsd.org> |
don't forget to send the log message, this fixes the commit command.
ok xsa@
|