From users-return-16443-apmail-jackrabbit-users-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Nov 03 09:59:07 2010 Return-Path: Delivered-To: apmail-jackrabbit-users-archive@minotaur.apache.org Received: (qmail 64726 invoked from network); 3 Nov 2010 09:59:07 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Nov 2010 09:59:07 -0000 Received: (qmail 71176 invoked by uid 500); 3 Nov 2010 09:59:38 -0000 Delivered-To: apmail-jackrabbit-users-archive@jackrabbit.apache.org Received: (qmail 71106 invoked by uid 500); 3 Nov 2010 09:59:36 -0000 Mailing-List: contact users-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: users@jackrabbit.apache.org Delivered-To: mailing list users@jackrabbit.apache.org Received: (qmail 71097 invoked by uid 99); 3 Nov 2010 09:59:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Nov 2010 09:59:36 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of jzitting@adobe.com designates 64.18.1.27 as permitted sender) Received: from [64.18.1.27] (HELO exprod6og111.obsmtp.com) (64.18.1.27) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Nov 2010 09:59:27 +0000 Received: from source ([192.150.8.22]) by exprod6ob111.postini.com ([64.18.5.12]) with SMTP ID DSNKTNEyaCusHNpb/3mvbKCmwy6Q1yY0n0n7@postini.com; Wed, 03 Nov 2010 02:59:06 PDT Received: from inner-relay-4.eur.adobe.com (inner-relay-4b [10.128.4.237]) by outbound-smtp-2.corp.adobe.com (8.12.10/8.12.10) with ESMTP id oA39x3Hd023995 for ; Wed, 3 Nov 2010 02:59:03 -0700 (PDT) Received: from nacas03.corp.adobe.com (nacas03.corp.adobe.com [10.8.189.121]) by inner-relay-4.eur.adobe.com (8.12.10/8.12.9) with ESMTP id oA39x1Zn007523 for ; Wed, 3 Nov 2010 02:59:02 -0700 (PDT) Received: from excas01.corp.adobe.com (10.8.188.201) by nacas03.corp.adobe.com (10.8.189.121) with Microsoft SMTP Server (TLS) id 8.2.254.0; Wed, 3 Nov 2010 02:59:02 -0700 Received: from eurhub01.eur.adobe.com (10.128.4.30) by excas01.corp.adobe.com (10.8.188.201) with Microsoft SMTP Server (TLS) id 8.2.254.0; Wed, 3 Nov 2010 02:59:02 -0700 Received: from eurmbx01.eur.adobe.com ([10.128.4.32]) by eurhub01.eur.adobe.com ([10.128.4.30]) with mapi; Wed, 3 Nov 2010 09:59:00 +0000 From: Jukka Zitting To: "users@jackrabbit.apache.org" Date: Wed, 3 Nov 2010 09:58:55 +0000 Subject: RE: version control basics Thread-Topic: version control basics Thread-Index: Act6rKA3iE8hZKv/R2i19DCD1AY6EAAAGOHg Message-ID: <9C0FC4C8E9C29945B01766FC7F9D389816BFCB0CFA@eurmbx01.eur.adobe.com> References: <9C0FC4C8E9C29945B01766FC7F9D389816BFA294D6@eurmbx01.eur.adobe.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org SGksDQoNCkZyb206IENoYWREYXZpcyBbbWFpbHRvOmNoYWRtaWNoYWVsZGF2aXNAZ21haWwuY29t XQ0KPiBJbiBwYXJ0aWN1bGFyLCBJJ20gbG9va2luZyB0byBpbXBsZW1lbnQgbG9ja2luZyBvZiBh IGRvY3VtZW50IGJ5IGFuDQo+IGF1dGhvci4gIEknbSB0cnlpbmcgdG8gZGVjaWRlIGJldHdlZW4g d2hldGhlciB0aGUgbG9ja2luZyBhcGkgb3IgdGhlDQo+IHZlcnNpb24gY29udHJvbCBhcGkncyBj aGVja2VkLW91dCBzdGF0ZSBhcmUgbW9yZSBhcHByb3ByaWF0ZS4gIEkndmUNCj4gcmVhZCBhIGxv dCBvZiBvbGRlciB0aHJlYWRzIG9uIHRoaXMgbGlzdCwgYnV0IGNvdWxkbid0IGZpbmQgYQ0KPiBz YXRpc2ZhY3RvcnkgZXhwbGFuYXRpb24uDQoNCklmIGFsbCB5b3UgbmVlZCBpcyBsb2NraW5nLCB0 aGVuIHVzaW5nIHRoZSBKQ1IgbG9ja2luZyBmZWF0dXJlIGlzIHByb2JhYmx5IG1vcmUgYXBwcm9w cmlhdGUgdGhhbiByZWx5aW5nIG9uIHRoZSBjaGVja2VkIGluIC8gY2hlY2tlZCBvdXQgc3RhdGVz IG9mIEpDUiB2ZXJzaW9uaW5nLg0KDQpUaGUgdmVyc2lvbmluZyBmZWF0dXJlIG9ubHkgY2FyZXMg YWJvdXQgdGhlIHN0YXRlIG9mIHRoZSB2ZXJzaW9uZWQgZG9jdW1lbnQsIG5vdCBhYm91dCB3aGlj aCB1c2VyIG9yIGNsaWVudCBpcyBhY2Nlc3NpbmcgaXQuIFRvIHN1bW1hcml6ZTogbm9ib2R5IGNh biBtb2RpZnkgYSBjaGVja2VkIGluIGRvY3VtZW50LCBhbmQgZXZlcnlvbmUgY2FuIG1vZGlmeSBh IGNoZWNrZWQgb3V0IGRvY3VtZW50Lg0KDQpUaGUgbG9ja2luZyBmZWF0dXJlIGRvZXMgY2FyZSBh Ym91dCB3aG8gaXMgYWNjZXNzaW5nIHRoZSBkb2N1bWVudDsgb25seSB0aGUgaG9sZGVyIG9mIGFu IGFjdGl2ZSBsb2NrIGNhbiBtb2RpZnkgYSBkb2N1bWVudC4NCg0KU28gaWYgeW91IHdhbnQgcGVy LWF1dGhvciBsb2NraW5nLCB0aGUgSkNSIGxvY2tpbmcgZmVhdHVyZSBzZWVtcyBsaWtlIHRoZSBt b3N0IGFwcHJvcHJpYXRlIHNvbHV0aW9uLg0KDQpCUiwNCg0KSnVra2EgWml0dGluZw0K