head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.44 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.42 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.40 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 pgoyette-compat-0625:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.38 pgoyette-compat-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.36 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.34 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 localcount-20160914:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.32 pgoyette-localcount-base:1.2 netbsd-5-2-3-RELEASE:1.2 netbsd-5-1-5-RELEASE:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 tls-earlyentropy:1.2.0.28 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-5-2-2-RELEASE:1.2 netbsd-5-1-4-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.2 netbsd-5-1-3-RELEASE:1.2 agc-symver:1.2.0.30 agc-symver-base:1.2 tls-maxphys-base:1.2 yamt-pagecache-base8:1.2 netbsd-5-2:1.2.0.26 yamt-pagecache-base7:1.2 netbsd-5-2-RELEASE:1.2 netbsd-5-2-RC1:1.2 yamt-pagecache-base6:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-5-1-2-RELEASE:1.2 netbsd-5-1-1-RELEASE:1.2 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.24 yamt-pagecache-base:1.2 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.22 bouyer-quota2-base:1.2 matt-nb5-pq3:1.2.0.20 matt-nb5-pq3-base:1.2 netbsd-5-1:1.2.0.18 netbsd-5-1-RELEASE:1.2 netbsd-5-1-RC4:1.2 netbsd-5-1-RC3:1.2 netbsd-5-1-RC2:1.2 netbsd-5-1-RC1:1.2 netbsd-5-0-2-RELEASE:1.2 netbsd-5-0-1-RELEASE:1.2 jym-xensuspend-nbase:1.2 netbsd-5-0:1.2.0.16 netbsd-5-0-RELEASE:1.2 netbsd-5-0-RC4:1.2 netbsd-5-0-RC3:1.2 netbsd-5-0-RC2:1.2 jym-xensuspend:1.2.0.14 jym-xensuspend-base:1.2 netbsd-5-0-RC1:1.2 netbsd-5:1.2.0.12 netbsd-5-base:1.2 mjf-devfs2:1.2.0.10 mjf-devfs2-base:1.2 yamt-pf42-base4:1.2 yamt-pf42-base3:1.2 hpcarm-cleanup-nbase:1.2 yamt-pf42-base2:1.2 yamt-pf42:1.2.0.8 yamt-pf42-base:1.2 keiichi-mipv6:1.2.0.6 keiichi-mipv6-base:1.2 cube-autoconf:1.2.0.4 cube-autoconf-base:1.2 hpcarm-cleanup:1.2.0.2 hpcarm-cleanup-base:1.2 netbsd-1-6-PATCH002-RELEASE:1.1.1.1 netbsd-1-6-PATCH002:1.1.1.1 netbsd-1-6-PATCH002-RC4:1.1.1.1 netbsd-1-6-PATCH002-RC3:1.1.1.1 netbsd-1-6-PATCH002-RC2:1.1.1.1 netbsd-1-6-PATCH002-RC1:1.1.1.1 netbsd-1-6-PATCH001:1.1.1.1 netbsd-1-6-PATCH001-RELEASE:1.1.1.1 netbsd-1-6-PATCH001-RC3:1.1.1.1 netbsd-1-6-PATCH001-RC2:1.1.1.1 netbsd-1-6-PATCH001-RC1:1.1.1.1 fvdl_fs64_base:1.1.1.1 netbsd-1-6-RELEASE:1.1.1.1 netbsd-1-6-RC3:1.1.1.1 netbsd-1-6-RC2:1.1.1.1 netbsd-1-6-RC1:1.1.1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH002:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-5-BETA2:1.1.1.1 netbsd-1-5-BETA:1.1.1.1 netbsd-1-5-ALPHA2:1.1.1.1 netbsd-1-5:1.1.1.1.0.4 netbsd-1-5-base:1.1.1.1 minoura-xpg4dl:1.1.1.1.0.2 minoura-xpg4dl-base:1.1.1.1 ntp-4-0-99i:1.1.1.1 UDEL:1.1.1; locks; strict; comment @# @; 1.2 date 2003.12.04.16.23.34; author drochner; state dead; branches; next 1.1; 1.1 date 2000.04.22.14.52.07; author simonb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.04.22.14.52.07; author simonb; state Exp; branches; next ; desc @@ 1.2 log @resolve conflicts (in this case, throw away all local modifications; I'll start patching from scratch) @ text @#! /bin/sh # # (hacked from egcs_update and pikt_update) # # Update a local CVS tree from the NTP repository, with an emphasis # on treating generated files correctly, so that autoconf, bison et # al are not required for the ``end'' user. # # By default all command-line options are passed to `cvs update` in # addition to $UPDATE_OPTIONS (defined below). If the first parameter # reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself # are omitted. # # Examples: # # ntp_update -r ntp_latest_snapshot # ntp_update -A # ntp_update --nostdflags -P -r ntp_1_1_branch foo/bar # # # (C) 1998 Free Software Foundation # Originally by Gerald Pfeifer , August 1998. # # This script is Free Software, and it can be copied, distributed and # modified as defined in the GNU General Public License. A copy of # its license can be downloaded from http://www.gnu.org/copyleft/gpl.html UPDATE_OPTIONS=-P # Add -d to create any directories that exist in the repository but not # locally. # Add -A to reset any sticky tags, dates, or `-k' options. echo "Current directory is `pwd`." # First of all, check whether this indeed looks like a local CVS of ntp. if [ ! -d CVS ] || [ ! -f ntpd/ntpd.c ]; then echo "This does not seem to be an ntp CVS tree!" exit fi # Check command-line options if [ x"${1}"x = x"--nostdflags"x ]; then shift else set -- $UPDATE_OPTIONS ${1+"$@@"} fi echo "Pass 1: Updating autoconf and bison generated files" find . -name configure.in -o -name '*.y' -o -name copyright.htm | grep -v '^\./A\.'| xargs cvs -q update echo "Pass 2: Updating full tree" cvs -q update ${1+"$@@"} echo "Pass 3: Fixing local tree" touch `find . -name aclocal.m4 -print` touch `find . -name configure -print` touch `find . -name Makefile.in -print` #touch `find texinfo -name \*.pot -print` #touch `find texinfo -name \*.gmo -print` # The following code should also touch the generated lex/yacc/rpc files for f in \ stamp-h.in do touch $f done @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import ntp 4.0.99i @ text @@