diff options
| author |   jcs <jcs@openbsd.org> | 2014-05-28 16:43:06 +0000 |
|---|---|---|
| committer | jcs <jcs@openbsd.org> | 2014-05-28 16:43:06 +0000 |
| commit | 1679d5d5c991a0952d9ea418d1fe7a0b01b67997 (patch) | |
| tree | fe9581df7f53bb91075d986e82aff07fd84c981e | |
| parent | Fixed chap_input() and chap_authenticate() not to be used as if they (diff) | |
| download | wireguard-openbsd-1679d5d5c991a0952d9ea418d1fe7a0b01b67997.tar.xz wireguard-openbsd-1679d5d5c991a0952d9ea418d1fe7a0b01b67997.zip | |
finally enable writing per-commit commitid tokens to rcs ,v files
ok deraadt@ millert@
| -rw-r--r-- | gnu/usr.bin/cvs/src/import.c | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/src/rcs.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/gnu/usr.bin/cvs/src/import.c b/gnu/usr.bin/cvs/src/import.c index 5699e2a2260..a97e70ea3d5 100644 --- a/gnu/usr.bin/cvs/src/import.c +++ b/gnu/usr.bin/cvs/src/import.c @@ -1198,10 +1198,8 @@ add_rcs_file (message, rcs, user, add_vhead, key_opt, if (fprintf (fprcs, "next ;\012") < 0) goto write_error; -#ifdef notyet if (fprintf (fprcs, "commitid %s;\012", global_session_id) < 0) goto write_error; -#endif #ifdef PRESERVE_PERMISSIONS_SUPPORT /* Store initial permissions if necessary. */ @@ -1258,11 +1256,8 @@ userfile); fprintf (fprcs, "date %s; author %s; state Exp;\012", altdate1, author) < 0 || fprintf (fprcs, "branches ;\012") < 0 || - fprintf (fprcs, "next ;\012") < 0 -#ifdef notyet - || + fprintf (fprcs, "next ;\012") < 0 || fprintf (fprcs, "commitid %s;\012", global_session_id) < 0 -#endif ) goto write_error; diff --git a/gnu/usr.bin/cvs/src/rcs.c b/gnu/usr.bin/cvs/src/rcs.c index 5684a7e3dbf..102698cefec 100644 --- a/gnu/usr.bin/cvs/src/rcs.c +++ b/gnu/usr.bin/cvs/src/rcs.c @@ -4921,9 +4921,7 @@ RCS_checkin (rcs, workfile, message, rev, flags) np->type = RCSFIELD; np->key = xstrdup ("commitid"); np->data = xstrdup(global_session_id); -#ifdef notyet addnode (delta->other_delta, np); -#endif #ifdef PRESERVE_PERMISSIONS_SUPPORT /* If permissions should be preserved on this project, then |