Home
last modified time | relevance | path

Searched refs:rev1 (Results 1 – 24 of 24) sorted by relevance

/openbsd/usr.bin/rcs/
H A Drcsmerge.c44 RCSNUM *rev1, *rev2; in rcsmerge_main() local
49 rev1 = rev2 = NULL; in rcsmerge_main()
131 rev1 = rcsnum_alloc(); in rcsmerge_main()
132 rcsnum_cpy(file->rf_head, rev1, 0); in rcsmerge_main()
133 } else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) in rcsmerge_main()
144 if (rcsnum_cmp(rev1, rev2, 0) == 0) in rcsmerge_main()
147 if ((bp = rcs_diff3(file, argv[0], rev1, rev2, flags)) == NULL) in rcsmerge_main()
151 (void)rcsnum_tostr(rev1, r1, sizeof(r1)); in rcsmerge_main()
177 rcsnum_free(rev1); in rcsmerge_main()
H A Drcsdiff.c52 RCSNUM *rev1, *rev2; in rcsdiff_main() local
57 rev1 = rev2 = NULL; in rcsdiff_main()
226 if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) in rcsdiff_main()
250 status = rcsdiff_rev(file, rev1, rev2, dflags); in rcsdiff_main()
253 rcsnum_free(rev1); in rcsdiff_main()
255 rev1 = rev2 = NULL; in rcsdiff_main()
372 diff_rev1 = rev1; in rcsdiff_rev()
376 rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1)); in rcsdiff_rev()
380 if ((b1 = rcs_getrev(file, rev1)) == NULL) { in rcsdiff_rev()
385 b1 = rcs_kwexp_buf(b1, file, rev1); in rcsdiff_rev()
[all …]
H A Ddiff3.c261 rcs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int flags) in rcs_diff3() argument
277 rcsnum_tostr(rev1, r1, sizeof(r1)); in rcs_diff3()
285 if ((b2 = rcs_getrev(rf, rev1)) == NULL) in rcs_diff3()
/openbsd/gnu/usr.bin/cvs/src/
H A Drcscmds.c236 RCS_merge(rcs, path, workfile, options, rev1, rev2) in RCS_merge() argument
241 char *rev1;
258 xrev1 = RCS_gettag (rcs, rev1, 0, NULL);
269 if (RCS_checkout (rcs, NULL, xrev1, rev1, options, tmp1,
383 char *rev1;
419 "cannot check out revision %s of %s", rev1, rcsfile->path);
448 RCS_output_diff_options (opts, rev1, rev2, workfile);
641 RCS_output_diff_options (opts, rev1, rev2, workfile) in RCS_output_diff_options() argument
643 char *rev1;
649 tmp = (char *) xmalloc (strlen (opts) + strlen (rev1) + 10);
[all …]
H A Dupdate.c2230 if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
2384 if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
2437 free (rev1);
2445 free (rev1);
2858 (rev1 == NULL ? "working file" : rev1));
2876 (rev1 == NULL ? "working file" : rev1),
2886 (rev1 == NULL ? "working file" : rev1),
2897 (rev1 == NULL ? "working file" : rev1),
2907 (rev1 == NULL ? "working file" : rev1),
2917 (rev1 == NULL ? "working file" : rev1),
[all …]
H A Dpatch.c33 static char *rev1 = NULL; variable
110 if (rev1 != NULL || date1 != NULL)
119 if (rev1 != NULL || date1 != NULL)
122 rev1 = optarg;
178 rev1 != NULL || rev2 != NULL))
182 rev1 == NULL && rev2 == NULL))
211 if (rev1)
212 option_with_arg ("-r", rev1);
344 if (rev1 != NULL && !rev1_validated)
346 tag_check_valid (rev1, argc - 1, argv + 1, local, 0, NULL);
[all …]
H A Dsubr.c282 compare_revnums (rev1, rev2) in compare_revnums() argument
283 const char *rev1; in compare_revnums()
291 sp = s = rev1;
400 gca (rev1, rev2) in gca() argument
401 const char *rev1; in gca()
410 if (rev1 == NULL || rev2 == NULL)
419 gca = xmalloc (strlen (rev1) + strlen (rev2) + 100);
423 p[0] = rev1;
482 error (0, 0, "bad revisions %s or %s", rev1, rev2);
H A Dadmin.c615 char *s, *t, *rev1, *rev2; local
641 rev1 = xstrdup (s);
647 rev1 = NULL;
653 rev1 = xstrdup (s);
663 if (rev1 == NULL && rev2 == NULL)
672 status |= RCS_delete_revs (rcs, rev1, rev2, inclusive);
673 if (rev1)
674 free (rev1);
H A Drcs.c6115 if (RCS_isbranch (rcs, rev1) && STREQ (rev1, rev2))
6116 rev1 = rev2 = RCS_getbranch (rcs, rev1, 0);
6138 rev2 = rev1;
6139 rev1 = temp;
6149 rev2 = rev1;
6150 rev1 = temp;
6169 rev1 = rev2;
6232 before = rev1;
6252 next = rev1;
6474 if (rev1 == NULL)
[all …]
H A Dcvs.h437 char *rev1, char *rev2,
479 char *gca PROTO((const char *rev1, const char *rev2));
780 char *rev1, char *rev2));
H A DChangeLog-97663 * rcs.c (RCS_delete_revs): If "rev1" equals "branchpoint", then set
673 RCS_getbranchpoint if rev1 is NULL; it still makes sense for the
679 * rcs.c (RCS_delete_revs): If rev1 == NULL and rev2 is on the
/openbsd/usr.bin/cvs/
H A Ddiff.c39 static char *rev1 = NULL; variable
108 if (date1 == -1 && rev1 == NULL) { in cvs_diff()
158 if (date1 == -1 && rev1 == NULL) { in cvs_diff()
159 rev1 = optarg; in cvs_diff()
259 if (rev1 != NULL) in cvs_diff()
260 cvs_client_send_request("Argument -r%s", rev1); in cvs_diff()
386 else if (rev1 != NULL || date1 != -1) { in cvs_diff_local()
390 if (rev1 != NULL) { in cvs_diff_local()
407 if ((diff_rev1 = rcsnum_parse(rev1)) == NULL) in cvs_diff_local()
408 fatal("no such tag %s", rev1); in cvs_diff_local()
[all …]
H A Dupdate.c579 RCSNUM *rev1, *rev2; in update_join_file() local
583 rev1 = rev2 = NULL; in update_join_file()
617 rev1 = rcs_translate_tag(jrev1, cf->file_rcs); in update_join_file()
623 rev1 = rcsnum_alloc(); in update_join_file()
624 rcsnum_cpy(cf->file_rcsrev, rev1, 0); in update_join_file()
629 if (rev1 != NULL) in update_join_file()
630 state1 = rcs_state_get(cf->file_rcs, rev1); in update_join_file()
676 if (!rcsnum_cmp(rev1, rev2, 0)) in update_join_file()
692 rcsnum_tostr(rev1, rbuf, sizeof(rbuf)); in update_join_file()
701 d3rev1 = rev1; in update_join_file()
[all …]
/openbsd/sys/dev/pci/bktr/
H A Dbktr_audio.c419 int rev1=0, rev2=0; in msp_read_id() local
420 rev1 = msp_dpl_read(bktr, bktr->msp_addr, 0x12, 0x001e); in msp_read_id()
424 "34%02d%c-%c%d", (rev2>>8)&0xff, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', in msp_read_id()
568 int rev1=0, rev2=0; in dpl_read_id() local
569 rev1 = msp_dpl_read(bktr, bktr->dpl_addr, 0x12, 0x001e); in dpl_read_id()
573 "34%02d%c-%c%d", ((rev2>>8)&0xff)-1, (rev1&0xff)+'@', in dpl_read_id()
574 ((rev1>>8)&0xff)+'@', rev2&0x1f); in dpl_read_id()
/openbsd/sys/arch/macppc/dev/
H A Dasms.c95 u_int8_t cmd, data, rev1, rev2, ver1, ver2; in asms_attach() local
147 sc->sc_addr, &cmd, sizeof cmd, &rev1, sizeof rev1, 0)) { in asms_attach()
246 printf(": rev %x.%x, version %x.%x", rev1, rev2, ver1, ver2); in asms_attach()
/openbsd/regress/usr.bin/rcs/
H A DMakefile278 @cp -f ${.CURDIR}/rev1 blah.c
290 @cp -f ${.CURDIR}/rev1 blah.c
303 @cp -f ${.CURDIR}/rev1 blah.c
315 @cp -f ${.CURDIR}/rev1 blah.c
554 @echo rev1 | ${CI} -q -l file
/openbsd/gnu/llvm/libcxx/
H A Dappveyor.yml23 # MINGW_PATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin
/openbsd/gnu/usr.bin/cvs/doc/
H A Dcvs.texinfo8347 @var{rev1}:@var{rev2} syntax is confusing).
8362 @item @var{rev1}::@var{rev2}
8365 from rev1 to rev2, not intermediate steps. For
8391 @item @var{rev1}:@var{rev2}
8392 Delete the revisions from @var{rev1} to @var{rev2},
8394 retrieve @var{rev1} or @var{rev2} or any of the
8404 specify @var{rev1}::@var{rev2} instead.
9724 @c about messages to get from revision rev1 to rev2,
9736 @item @var{rev1}:@var{rev2}
9740 @item @var{rev1}::@var{rev2}
[all …]
H A Dcvs.info-5821 Collapse all revisions between rev1 and rev2, so that CVS
822 only stores the differences associated with going from rev1
H A Dcvs.info-6140 * Synopsis: diff [-lR] [format_options] [[-r rev1 | -D date1] [-r
H A Dcvsclient.texi1125 @item -r@var{rev1}:@var{rev2}
1129 Specify revisions (note that @var{rev1} or @var{rev2} can be omitted, or
/openbsd/gnu/usr.bin/cvs/
H A DNEWS111 revisions between rev1 and rev2 without deleting rev1 or rev2
H A DFAQ4061 cvs diff -r <tag1/rev1> -r <tag2/rev2> <file>
5024 If both <rev1> and <rev2> are on the same branch, you can get what you
5028 cvs log -r<rev1>:<rev2> <file>
5030 If you want all the revisions on the branch from <rev1> to the end of
5031 the branch <rev1> is on, you can use:
5033 cvs log -r<rev1>: <file>
5035 (If <rev1> is a numeric RCS symbol attached to a branch revision with
5043 Note: Depending on whether <rev1> and <rev2> are:
H A DChangeLog995 * NEWS: Mention admin -o rev1::rev2.