Date: Wed, 17 Oct 2001 00:38:33 -0400 (EDT) From: <doug@safeport.com> To: freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster -- whats the best way? Message-ID: <Pine.BSF.4.21.0110170037560.23659-200000@pemaquid.safeport.com>
next in thread | raw e-mail | index | archive | help
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-555383740-1003293353=:23659 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII Content-ID: <Pine.BSF.4.21.0110170037562.23659@pemaquid.safeport.com> @#$%^& - forgot to attach the script - sorry _____ Douglas Denault doug@safeport.com Voice: 301-469-8766 Fax: 301-469-0601 --0-555383740-1003293353=:23659 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME="mm_update.sh" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.BSF.4.21.0110170035530.23659@pemaquid.safeport.com> Content-Description: Content-Disposition: ATTACHMENT; FILENAME="mm_update.sh" IyEvYmluL3NoDQpkaXNwbGF5X3VzZSgpIHsNCiAgZWNobyAibW1fdXBkYXRl IGlzIGRlc2lnbmVkIHRvIGJlIHJ1biBhZnRlciBtZXJnZW1hc3Rlci4gVGhl IGdvYWwgaXMgdG8iDQogIGVjaG8gImlkZW50aWZ5IGZpbGVzIGluIC9ldGMg dGhhdCB3ZXJlIG5vdCBjaGFuZ2VkIHNpbmNlIHRoZSBsYXN0IGludm9jYXRp b24iDQogIGVjaG8gIm9mIG1lcmdlbWFzdGVyIGJ1dCB3ZXJlIGxlZnQgYWZ0 ZXIgJ21lcmdlbWFzdGVyIC1haScuIFRoZXJlIHdpbGwgYmUgc29tZSINCiAg ZWNobyAibnVtYmVyIG9mIGZpbGVzIHdpdGggdGhlIHNhbWUgZGF0ZSB0aGF0 IGNhbiBiZSByZWNvZ25pemVkIGFzIHVuY2hhbmdlZC4iDQogIGVjaG8gIlRo ZXNlIGZpbGVzIGNhbiBiZSBzZWxlY3RlZCBieSBkYXRlIHRvIGJlIHVwZGF0 ZWQsIGxlYXZpbmcgdGhlIGZpbGVzIg0KICBlY2hvICJ0aGF0IGhhdmUgYmVl biBsb2NhbGx5IGNoYW5nZWQgdG8gdGhlIHN0YW5kYXJkIHByb2Nlc3MuIg0K ICBlY2hvICIgICINCiAgZWNobyAiU28gdG8gdXNlIG1tX3VwZGF0ZToiDQog IGVjaG8gIiAiDQogIGVjaG8gIiAgbWVyZ2VtYXN0ZXIgLWFpIg0KICBlY2hv ICIgIG1tX3VwZGF0ZSAtbCINCiAgZWNobyAiICBtbV91cGRhdGUgLXIgLWQg ZGF0ZSINCiAgZWNobyAiICINCiAgZWNobyAiVGhlIGxhc3Qgc3RlcCBtYXkg bmVlZCB0byBiZSByZXBlYXRlZCBkZXBlbmRpbmcgb24gaG93Ig0KICBlY2hv ICJtZXJnZW1hc3RlciB3YXMgdXNlZCBwcmV2aW91c2x5Ig0KICBlY2hvICIg Ig0KfQ0KDQpkaXNwbGF5X2hlbHAgKCkgew0KICBlY2hvICJVc2FnZTogbW1f dXBkYXRlIFstaGxyXSBbLWQgZGF0ZV0gIFstdCAvcGF0aF0iDQogIGVjaG8g Ik9wdGlvbnM6Ig0KICBlY2hvICItaCAgVXNhZ2UgaW5mb3JtYXRpb24iDQog IGVjaG8gIi1sICBMaXN0IHJlbWFpbmluZyBmaWxlcyBhbmQgbGFzdCBtb2Rp ZmljYXRpb24gZGF0ZSINCiAgZWNobyAiLWQgIFJlcGxhY2VtZW50IGRhdGUg LSBtdXN0IG1hdGNoIGxzIC1sIGZvcm1hdCINCiAgZWNobyAiLXIgIFJlcGxh Y2UgZmlsZXMgaW4gL2V0YyB0aGF0IG1hdGNoIFtkYXRlXSINCiAgZWNobyAi LXQgIC9wYXRoL2RpcmVjdG9yeSBvZiB0ZW1wIHJvb3QgdXNlZCBieSBtZXJn ZW1hc3RlciINCiAgZWNobyAiLXYgIGxpc3QgZmlsZXMgYXMgdGhleSBhcmUg dXBkYXRlZCINCn0NCg0KVEVNUFJPT1Q9Jy92YXIvdG1wL3RlbXByb290Jw0K VVNFUl9ST09UPW5vDQpCQVNFX0RBVEU9bm9uZQ0KVVBEQVRFPW5vDQpMSVNU PW5vDQoNCiMgcHJvY2VzcyBjb21tYW5kIGxpbmUgcGFybXMNCiMNCndoaWxl IGdldG9wdHMgIjpobGQ6dDpydiIgT1BUSU9OUyA7IGRvDQogIGNhc2UgIiR7 T1BUSU9OU30iIGluDQogIGgpDQogICAgZGlzcGxheV91c2UNCiAgICBkaXNw bGF5X2hlbHANCiAgICBleGl0IDANCiAgICA7Ow0KICBsKQ0KICAgIExJU1Q9 eWVzDQogICAgOzsNCiAgZCkNCiAgICBCQVNFX0RBVEU9JHtPUFRBUkd9DQog ICAgOzsNCiAgcikNCiAgICBVUERBVEU9eWVzDQogICAgOzsNCiAgdCkNCiAg ICBURU1QUk9PVD0ke09QVEFSR30NCiAgICBVU0VSX1JPT1Q9eWVzDQogICAg OzsNCiAgdikNCiAgICBWRVJCT1NFPXllcw0KICAgIDs7DQogICopDQogICAg ZGlzcGxheV9oZWxwDQogICAgZXhpdCAxDQogICAgOzsNCiAgZXNhYw0KZG9u ZQ0KDQojIGNoZWNrIHRvIGFsbG93IG1tX3VwZGF0ZSB3aGVuIHRlbXAgcm9v dCBkb2VzIG5vdCBleGlzdA0KIw0KaWYgWyAiJHsjfSIgPSAwIF07IHRoZW4N CiAgZGlzcGxheV9oZWxwDQogIGV4aXQgMQ0KZmkNCg0KIyBkbyBzb21lIHNh bml0eSBjaGVja2luZyBvbiB0aGUgb3B0aW9ucw0KIw0KaWYgWyAtZCAiJHtU RU1QUk9PVH0iIF07IHRoZW4NCiAgaWYgWyAhIC1kICIke1RFTVBST09UfS9l dGMiIF07IHRoZW4NCiAgICBlY2hvICIke1RFTVBST09UfS9ldGMgZG9lcyBu b3QgZXhpc3QiDQogICAgZXhpdCAxDQogIGZpDQplbHNlDQogIGVjaG8gIiR7 VEVNUFJPT1R9IGRvZXMgbm90IGV4aXN0IC0gcnVuOiBtZXJnZW1hc3RlciAt YWkiDQogIGV4aXQgMQ0KZmkNCg0KaWYgWyAiJHtVUERBVEV9IiA9ICJ5ZXMi IC1hICIke0xJU1R9IiA9ICJ5ZXMiIF07IHRoZW4NCiAgZWNobyAibGlzdCBh bmQgcmVwbGFjZSBhcmUgbXV0dWFsbHkgZXhjbHVzaXZlIg0KICBleGl0IDEN CmZpDQoNCmlmIFsgIiR7VVBEQVRFfSIgPSAieWVzIiAtYSAiJHtCQVNFX0RB VEV9IiA9ICJub25lIiBdOyB0aGVuDQogIGVjaG8gInRvIGRvIHVwZGF0ZSB5 b3UgbXVzdCBzcGVjaWZ5IGEgYmFzZSBkYXRlIGZvciAvZXRjIGZpbGVzIg0K ICBleGl0IDENCmZpDQoNCiMgc2VlbXMgb2theSB0byBkbyB3aGF0IHdhcyBh c2tlZCBmb3INCiMNCmlmIFsgIiR7TElTVH0iID0gInllcyIgXTsgdGhlbg0K ICBjZCAke1RFTVBST09UfS9ldGMNCiAgZm9yIEZJTEVfTEVGVCBpbiBgZmlu ZCAuIC10eXBlIGZgOyBkbw0KICAgIGxzIC1sIC9ldGMvJHtGSUxFX0xFRlR9 IHwgYXdrICd7cHJpbnQgJDYgIiAiICQ3ICIgIiAkOCAiICIgJDl9Jw0KICBk b25lDQogIGV4aXQgMA0KZmkNCg0KaWYgWyAiJHtVUERBVEV9IiA9ICJ5ZXMi ICBdOyB0aGVuDQogIGNkICR7VEVNUFJPT1R9L2V0Yw0KICBmb3IgRklMRV9M RUZUIGluIGBmaW5kIC4gLXR5cGUgZmA7IGRvDQogICAgKGxzIC1sIC9ldGMv JHtGSUxFX0xFRlR9IHwgZ3JlcCAiJHtCQVNFX0RBVEV9Ij4vZGV2L251bGwp ICYmIFwNCiAgICAoaWYgWyAiJHtWRVJCT1NFfSIgPSAieWVzIiBdOyB0aGVu DQogICAgICAgZWNobyBtb3ZlICR7RklMRV9MRUZUfQ0KICAgICBmaQ0KICAg ICBtdiAke1RFTVBST09UfS9ldGMvJEZJTEVfTEVGVCAvZXRjLyRGSUxFX0xF RlQpDQogIGRvbmUNCiAgZXhpdCAwDQpmaQ0KZWNobyAibW1fdXBkYXRlIGZs b3cgZXJyb3IiICAgICNzaG91bGQgbm90IGdldCBoZXJlDQpleGl0IDENCg== --0-555383740-1003293353=:23659-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0110170037560.23659-200000>