This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--0-1287004878-856337229=:11332
Content-Type: TEXT/PLAIN; charset=US-ASCII

On Mon, 17 Feb 1997, Bill Studenmund wrote:

.. I'm trying to get set up to use CVS to follow current and to preserve
.. local mods. I kinda understand how cvs works, but I'm still a little
.. confused about tags and the different branches. How do I tell it I'm
.. updating the "vendor" branch (1.1.1X AFAIK) as opposed to my branch?
.. 
.. I understand the basic idea about having a repository, a hierarchy for
.. suping, and a checked out version for actual work. I'm not so clear on the
.. tags and such involved.
.. 
.. I'm wondering if some kind soul who does this can either EMail me cvs
.. scripts or a URL for doing this. Or is there a good Nutshell book? The CVS
.. help docs are good, but I'm looking for something with a few more
.. examples.
.. 
.. Thanks!
.. 
.. Bill
.. 

Attached to this message, you'll find 3 scripts that I use to retrieve
(sup) NetBSD sources and import the updated files into a cvs repository.

dosup calls dosup1 for each sup collection to be retrieved. dosup1
calls clean-sup-output to reduce the sup output to just the list of
retrieved files (plus any non-expected output lines).

The new files are copied to a new directory and then "cvs import"'ed.
This is done to save the time to run cvs import in a fully populated
/usr/src directory tree.

I do not handle deletions automatically, but they do end up in my 
mailbox.

These scripts may easily be adapted to run part of the work (i.e.
the sup part) on a networked computer and then bringing the
up*.tgz files back home for import into a non-networked machine.

Feel free to use or adapt these scripts....

best regards
Erik Bertelsen

--0-1287004878-856337229=:11332
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=dosup
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.ULT.3.95.970219082709.11332B@sockdev.uni-c.dk>
Content-Description: dosup

IyEvYmluL3NoDQoNCnNoIGRvc3VwMSBpbmNsdWRlICQxDQpzaCBkb3N1cDEg
a3NyYy1jb21tb24gJDENCnNoIGRvc3VwMSBrc3JjLW1hYzY4ayAkMQ0Kc2gg
ZG9zdXAxIGtzcmMtaTM4NiAkMQ0Kc2ggZG9zdXAxIGtzcmMtcG1heCAkMQ0K
c2ggZG9zdXAxIGRvYyAkMQ0Kc2ggZG9zdXAxIG90aGVyc3JjICQxDQpzaCBk
b3N1cDEgc3JjICQxDQoNCmV4aXQNCg0KDQojY3VycmVudCAgICAgICAgIGFs
bHNyYyAgICAgICAgICBOZXRCU0QtY3VycmVudCBzb3VyY2VzLCBleGNsdWRp
bmcgZXhwb3J0LQ0KIyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
cmVzdHJpY3RlZCBmaWxlcy4gIChzZWUgdGhlIHNlY3VyaXR5IHJlbGVhc2UN
CiMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJlbG93LCBhbmQg
dGhlIG5vdGUgYWJvdXQgaXQgZnVydGhlciBiZWxvdykNCiNjdXJyZW50ICAg
ICAgICAgYm1ha2UgICAgICAgICAgIHRoZSBOZXRCU0QtY3VycmVudCBCZXJr
ZWxleSAnbWFrZScgc291cmNlcw0KI2N1cnJlbnQgICAgICAgICBkb2MgICAg
ICAgICAgICAgdGhlIE5ldEJTRC1jdXJyZW50ICdkb2MnIGRpcmVjdG9yeQ0K
I2N1cnJlbnQgICAgICAgICBnYW1lcyAgICAgICAgICAgdGhlIE5ldEJTRC1j
dXJyZW50IGdhbWVzDQojY3VycmVudCAgICAgICAgIGdudSAgICAgICAgICAg
ICB0aGUgTmV0QlNELWN1cnJlbnQgR05VIHNvdXJjZXMNCiNjdXJyZW50ICAg
ICAgICAgaW5jbHVkZSAgICAgICAgIHRoZSBOZXRCU0QtY3VycmVudCBpbmNs
dWRlIGZpbGUgc291cmNlcw0KI2N1cnJlbnQgICAgICAgICBrc3JjICAgICAg
ICAgICAgYWxsIG9mIHRoZSBOZXRCU0QtY3VycmVudCBrZXJuZWwgc291cmNl
cw0KIyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5kIGEgZmV3
IGFzc29jaWF0ZWQgYmluYXJpZXMuDQojY3VycmVudCAgICAgICAgIGtzcmMt
Y29tbW9uICAgICB0aGUgbWFjaGluZS1pbmRlcGVuZGVudCBrZXJuZWwgc291
cmNlcywgYW5kDQojICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBh
IGZldyBhc3NvY2lhdGVkIGJpbmFyaWVzLg0KI2N1cnJlbnQgICAgICAgICBr
c3JjLWFscGhhICAgICAgbWFjaGluZSBkZXBlbmRlbnQga2VybmVsIHNvdXJj
ZXMgZm9yIHRoZSBhbHBoYQ0KI2N1cnJlbnQgICAgICAgICBrc3JjLWFtaWdh
ICAgICAgIiIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBhbWlnYQ0KI2N1cnJlbnQgICAgICAgICBrc3JjLWRhMzAgICAgICAgIiIg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYTMwDQoj
Y3VycmVudCAgICAgICAgIGtzcmMtaHAzMDAgICAgICAiIiAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhwMzAwDQojY3VycmVudCAg
ICAgICAgIGtzcmMtaTM4NiAgICAgICAiIiAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIGkzODYNCiNjdXJyZW50ICAgICAgICAga3Ny
Yy1tYWM2OGsgICAgICIiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgbWFjNjhrDQojY3VycmVudCAgICAgICAgIGtzcmMtcGM1MzIg
ICAgICAiIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IHBjNTMyDQojY3VycmVudCAgICAgICAgIGtzcmMtcG1heCAgICAgICAiIiAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBtYXgNCiNj
dXJyZW50ICAgICAgICAga3NyYy1zcGFyYyAgICAgICIiICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BhcmMNCiNjdXJyZW50ICAg
ICAgICAga3NyYy1zdW4zICAgICAgICIiICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgc3VuMw0KI2N1cnJlbnQgICAgICAgICBrc3Jj
LXZheCAgICAgICAgIiIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICB2YXgNCiNjdXJyZW50ICAgICAgICAgb3RoZXJzcmMgICAgICAg
IG90aGVyIHVzZWZ1bCwgYnV0IG5vdCByZXF1aXJlZCBzb3VyY2VzIChjdnMg
b2cgc3VwKQ0KI2N1cnJlbnQgICAgICAgICByZWdyZXNzICAgICAgICAgcmVn
cmVzc2lvbiB0ZXN0cw0KI2N1cnJlbnQgICAgICAgICBzZWN1cml0eSAgICAg
ICAgc2VjdXJpdHkgc291cmNlcyAoc2VlIGJlbG93KQ0KI2N1cnJlbnQgICAg
ICAgICBzcmMgICAgICAgICAgICAgc291cmNlcyBmb3IgTmV0QlNELWN1cnJl
bnQsIGV4Y2x1ZGluZw0KIyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAga2VybmVsIHNvdXJjZXMsIGdhbWVzLCByZWdyZXNzaW9uIHRlc3RzLA0K
IyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5kIGV4cG9ydC1y
ZXN0cmljdGVkIHNvdXJjZXMNCiNjdXJyZW50ICAgICAgICAgdGFyX2ZpbGVz
ICAgICAgIGd6aXBwZWQgdGFyIGZpbGVzIG9mIHRoZSBOZXRCU0QtY3VycmVu
dA0KIyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3JjIGFuZCBv
dGhlcnNyYyBmaWxlcywgZXhjbHVkaW5nIGV4cG9ydC0NCiMgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIHJlc3RyaWN0ZWQgc291cmNlcy4NCiMN
CiNJZiB5b3Ugb25seSB3YW50IHRoZSBrZXJuZWwgc291cmNlcyBmb3IgYSBz
cGVjaWZpYyBwb3J0IHRoZXJlIGFyZSBzb21lDQojc3ViLXJlbGVhc2VzIG9m
IHRoZSAiY3VycmVudCIgY29sbGVjdGlvbiB0aGF0IHlvdSBjYW4gdXNlIGlu
c3RlYWQgb2YNCiN0aGUgImtzcmMiIG9uZS4gSWYgeW91IGFyZSB1c2luZyB0
aGUgc3ViLXJlbGVhc2VzLCBiZSBzdXJlIHRvIGFsc28gc3VwDQojdGhlICJr
c3JjLWNvbW1vbiIgcmVsZWFzZS4NCiMNCiMgICAgICAgIGtzcmMtY29tbW9u
DQojICAgICAgICAgICAgICAgIEtlcm5lbCBzb3VyY2VzIGNvbW1vbiB0byBh
bGwgcG9ydHMuDQojDQojICAgICAgICBrc3JjLWkzODYsIGtzcmMtc3BhcmMs
IGtzcmMtaHAzMDAsIGtzcmMtYW1pZ2EsIGtzcmMtbWFjLA0KIyAgICAgICAg
a3NyYy1wYzUzMiwga3NyYy1wbWF4LCBrc3JjLXN1bjMNCiMgICAgICAgICAg
ICAgICAgS2VybmVsIHNvdXJjZXMgZm9yIGEgcGFydGljdWxhciBwb3J0Lg0K
Iw0K
--0-1287004878-856337229=:11332
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=dosup1
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.ULT.3.95.970219082709.11332C@sockdev.uni-c.dk>
Content-Description: dosup1

IyEvYmluL3NoDQoNCiMgZG9zdXAxIGZpbGUtc2V0DQoNCnN1cD0vdXNyL2xv
Y2FsL3NiaW4vc3VwDQpzdXBmaWxlPS90bXAvc3VwLiQkDQoNCmg9c3VwLk5l
dEJTRC5vcmcNCmhiPS9hL2Fub25fZnRwDQpiPS9zdy9zdXAtcmVwb3NpdG9y
aWVzDQojcD0vdXNyL3N1cC9uZXRic2QNCnA9L3N3L3N1cC1yZXBvc2l0b3Jp
ZXMvbmV0YnNkDQprdz0iYmFja3VwIGRlbGV0ZSB1c2UtcmVsLXN1ZmZpeCIN
Cg0Kb3V0PXN1cC5vdXQuJCQNCnRtcGRpcj0vdG1wL3N1cGN2cy4kJA0KDQpp
ZiBbIC1mICRvdXQgXTsgdGhlbg0KIGVjaG8gIk5ldyBzdXAub3V0LiBmaWxl
IGFscmVhZHkgZXhpc3RzLCB0cnkgYWdhaW4uLi4iDQogZXhpdCAwDQpmaQ0K
DQpjYXQgPiAkc3VwZmlsZSA8PCBFT0YNCmN1cnJlbnQgcmVsZWFzZT0kMSBo
b3N0PSRoIGhvc3RiYXNlPSRoYiBiYXNlPSRiIHByZWZpeD0kcCAka3cgJDIN
CkVPRg0KDQppZiBbIC10IDEgXTsgdGhlbg0KICRzdXAgLXYgLWIgJHN1cGZp
bGUgfCB0ZWUgJG91dA0KZWxzZQ0KICRzdXAgLXYgLWIgJHN1cGZpbGUgPiAk
b3V0DQpmaQ0Kcm0gLWYgJHN1cGZpbGUNCg0Kc2ggLi4vY2xlYW4tc3VwLW91
dHB1dCAkb3V0IGN1cnJlbnQtJDEgZXJpayxyZWNlcmlrQGluZXQudW5pLWMu
ZGsNCnN0PSQ/DQppZiBbICRzdCAhPSAwIF07IHRoZW4NCiBlY2hvICJGZWps
IGkgY2xlYW4tc3VwLW91dHB1dCAoJHN0KS4iDQogZXhpdCAxDQpmaQ0KDQpp
ZiBbICEgLXMgJG91dCBdOyB0aGVuDQogZXhpdCAwDQpmaQ0KDQpybSAtcmYg
JHRtcGRpcg0KbWtkaXIgJHRtcGRpcg0KdGFyIGNmICR0bXBkaXIvVXBkYXRl
LnRneiBgY2F0ICRvdXRgDQpteWRpcj1gcHdkYA0KY2QgJHRtcGRpcg0KdGFy
IHhmIFVwZGF0ZS50Z3oNCnRvcD1gZWNobyBbYS16XSpgDQpjZCAkdG9wDQoN
CmQ9YGRhdGUgKyV5JW0lZGANCkNWU1JPT1Q9L3N3L2N2cy1iYXNlIC91c3Iv
bG9jYWwvYmluL2N2cyAtcSBpbXBvcnQgLUkgISAtbSAiRGFnbGlnIGltcG9y
dCAkZC4iICR0b3AgTmV0QlNEIGkkZA0KbXYgJG15ZGlyLyRvdXQgJG15ZGly
LyRvdXQuaW1wb3J0ZXJldA0KDQpjZCAkbXlkaXINCnJtIC1yZiAkdG1wZGly
DQoNCmV4aXQgMA0K
--0-1287004878-856337229=:11332
Content-Type: TEXT/PLAIN; charset=ISO-8859-1; name=clean-sup-output
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.ULT.3.95.970219082709.11332D@sockdev.uni-c.dk>
Content-Description: clean-sup-output

IyEvYmluL3NoDQoNCiMgS2FsZGVzIHNvbTogc2ggY2xlYW4tc3VwLW91dHB1
dCBvdXQtZmlsZSBzdXAtY29sbGVjdGlvbiB1c2Vycy10by1ub3RpZnkNCg0K
b3V0PSQxDQpzdXBjb2xsPSQyDQp0b25vdGlmeT0kMw0KbXl0bXA9dG1wLiQk
DQoNClsgISAtcyAkb3V0IF0gJiYgew0KIGVjaG8gIiQwOiBpbnB1dCBmaWxl
ICckb3V0JyBtaXNzaW5nIG9yIGVtcHR5LiINCiBleGl0IDENCn0NCg0KDQoj
IDEuIGxpbmllDQoNCnJtIC1mICRteXRtcA0KaGVhZCAtMSAkb3V0IHwgZ3Jl
cCAiU1VQIDguMjYgKDQuMyBCU0QpIiA+ICRteXRtcCB8fCBleGl0IDENClsg
ISAtcyAkbXl0bXAgXSAmJiB7DQogIGVjaG8gImZvcmtlcnQgU1VQIHZlcnNp
b25zbGluaWUiDQogIHJtIC1mICRteXRtcA0KICBleGl0IDENCn0NCnJtIC1m
ICRteXRtcA0KdGFpbCArMiAkb3V0ID4gJG15dG1wDQptdiAkbXl0bXAgJG91
dA0KDQojIDIuIGxpbmllDQoNCnJtIC1mICRteXRtcA0KaGVhZCAtMSAkb3V0
IHwgZ3JlcCAiU1VQIFVwZ3JhZGUgb2YgJHN1cGNvbGwgYXQiID4gJG15dG1w
DQpbICEgLXMgJG15dG1wIF0gJiYgew0KICBlY2hvICJmb3JrZXJ0IGtvbW1h
bmRvbGluaWUiDQogIHJtIC1mICRteXRtcA0KICBleGl0IDENCn0NCnJtIC1m
ICRteXRtcA0KdGFpbCArMiAkb3V0ID4gJG15dG1wDQptdiAkbXl0bXAgJG91
dA0KDQojIDMuIGxpbmllDQoNCnJtIC1mICRteXRtcA0KaGVhZCAtMSAkb3V0
IHwgZ3JlcCAiU1VQIEZpbGVzZXJ2ZXIgWzg5XS4xMyIgPiAkbXl0bXANClsg
ISAtcyAkbXl0bXAgXSAmJiB7DQogIGVjaG8gImZvcmtlcnQgZmlsZSBzZXJ2
ZXIgdmVyc2lvbnNsaW5pZSINCiAgcm0gLWYgJG15dG1wDQogIGV4aXQgMQ0K
fQ0Kcm0gLWYgJG15dG1wDQp0YWlsICsyICRvdXQgPiAkbXl0bXANCm12ICRt
eXRtcCAkb3V0DQoNCiMgNC4gbGluaWUNCg0Kcm0gLWYgJG15dG1wDQpoZWFk
IC0xICRvdXQgfCBncmVwICJTVVAgUmVxdWVzdGluZyBjaGFuZ2VzIHNpbmNl
IiA+ICRteXRtcA0KWyAhIC1zICRteXRtcCBdICYmIHsNCiAgZWNobyAiZm9y
a2VydCBmaWxlIHNlcnZlciB2ZXJzaW9uc2xpbmllIg0KICBybSAtZiAkbXl0
bXANCiAgZXhpdCAxDQp9DQpybSAtZiAkbXl0bXANCnRhaWwgKzIgJG91dCA+
ICRteXRtcA0KbXYgJG15dG1wICRvdXQNCg0KIyBzaWRzdGUgbGluaWUNCg0K
dGFpbCAtMXIgJG91dCB8IGdyZXAgIlNVUCBVcGdyYWRlIG9mICRzdXBjb2xs
IGNvbXBsZXRlZCBhdCIgPiAkbXl0bXANClsgISAtcyAkbXl0bXAgXSAmJiB7
DQogIGVjaG8gImZvcmtlcnQgYWZzbHV0bmluZ3NsaW5pZSINCiAgcm0gLWYg
JG15dG1wDQogIGV4aXQgMQ0KfQ0Kc2VkIC1lICckZCcgJG91dCA+ICRteXRt
cA0KbXYgJG15dG1wICRvdXQNCg0Kc2VkIC1lICcvU1VQIFVwZGF0ZWQgZGly
ZWN0b3J5L2QnICRvdXQgPiAkbXl0bXANCm12ICRteXRtcCAkb3V0DQoNCnNl
ZCAtZSAnL1NVUCBDcmVhdGVkIGRpcmVjdG9yeS9kJyAkb3V0ID4gJG15dG1w
DQptdiAkbXl0bXAgJG91dA0KDQpzZWQgLWUgJy9TVVAgVXBkYXRpbmcgZmls
ZS9kJyAkb3V0ID4gJG15dG1wDQptdiAkbXl0bXAgJG91dA0KDQpncmVwICJT
VVAgRGVsZXRlZCIgJG91dCA+ICRteXRtcA0KaWYgWyAtcyAkbXl0bXAgXTsg
dGhlbg0KIG1haWwgLXMgIk5ldEJTRCBkZWxldGVkIGZpbGVzIiAkdG9ub3Rp
ZnkgPCAkbXl0bXANCiBncmVwIC12ICJTVVAgRGVsZXRlZCIgJG91dCA+ICRt
eXRtcA0KIG12ICRteXRtcCAkb3V0DQpmaQ0KDQpzZWQgLWUgJ3MvU1VQIFJl
Y2VpdmluZyBmaWxlLy8nICRvdXQgPiAkbXl0bXANCm12ICRteXRtcCAkb3V0
DQoNCmlmIFsgISAtcyAkb3V0IF07IHRoZW4NCiBpZiBbIC10IDEgXTsgdGhl
bg0KICBlY2hvICJL+HJzZWwgdWRlbiBueWUgZGF0YSINCiBmaQ0KIHJtIC1m
ICRvdXQNCiBleGl0IDANCmZpDQoNCmdyZXAgLXEgU1VQICRvdXQgJiYgKGVj
aG8gIkRlciBlciBzdGFkaWcgU1VQLWxpbmllciBpICRvdXQuIjsgZXhpdCAx
KQ0KDQpleGl0IDANCg==
--0-1287004878-856337229=:11332--