diff options
| author | Niall O'Higgins <niallo@cvs.openbsd.org> | 2007-06-01 17:47:48 +0000 |
|---|---|---|
| committer | Niall O'Higgins <niallo@cvs.openbsd.org> | 2007-06-01 17:47:48 +0000 |
| commit | 55f2ba3781318b7859fa01dea8f70c83af0e2fcd (patch) | |
| tree | 67b92eb83492cf561bdcde3e70c211dcc3df0783 /usr.bin/cvs/import.c | |
| parent | c54ed097c1e1ef429f60d9c3b2d45d7188f30599 (diff) | |
add support for local and remote branch checkout. for example,
cvs co -rOPENBSD_3_0 works now.
along the way, simplify and rationalise code and fix a few nits.
ok joris@ xsa@ ray@
Diffstat (limited to 'usr.bin/cvs/import.c')
| -rw-r--r-- | usr.bin/cvs/import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index c15de550ccf..b2034ed006c 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.72 2007/02/22 06:42:09 otto Exp $ */ +/* $OpenBSD: import.c,v 1.73 2007/06/01 17:47:47 niallo Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -338,7 +338,7 @@ import_update(struct cvs_file *cf) import_tag(cf, brev, newrev); - if (cf->file_rcs->rf_branch == NULL || cf->file_rcs->rf_inattic == 1 || + if (cf->file_rcs->rf_branch == NULL || cf->in_attic == 1 || strcmp(branch, import_branch)) { import_conflicts++; cvs_printf("C %s/%s\n", import_repository, cf->file_path); |