Return-Path: X-Original-To: apmail-flex-dev-archive@www.apache.org Delivered-To: apmail-flex-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 89258F362 for ; Thu, 21 Mar 2013 20:59:23 +0000 (UTC) Received: (qmail 60574 invoked by uid 500); 21 Mar 2013 20:59:22 -0000 Delivered-To: apmail-flex-dev-archive@flex.apache.org Received: (qmail 60552 invoked by uid 500); 21 Mar 2013 20:59:22 -0000 Mailing-List: contact dev-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list dev@flex.apache.org Received: (qmail 60541 invoked by uid 99); 21 Mar 2013 20:59:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 20:59:22 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of gosmith@adobe.com designates 64.18.1.191 as permitted sender) Received: from [64.18.1.191] (HELO exprod6og106.obsmtp.com) (64.18.1.191) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 20:59:15 +0000 Received: from outbound-smtp-2.corp.adobe.com ([193.104.215.16]) by exprod6ob106.postini.com ([64.18.5.12]) with SMTP ID DSNKUUt0jpGZdbUb4MYcPMnVEW3Mv/ttOrTP@postini.com; Thu, 21 Mar 2013 13:58:55 PDT Received: from inner-relay-1.corp.adobe.com (inner-relay-1.corp.adobe.com [153.32.1.51]) by outbound-smtp-2.corp.adobe.com (8.12.10/8.12.10) with ESMTP id r2LKwr2h019711 for ; Thu, 21 Mar 2013 13:58:53 -0700 (PDT) Received: from nahub02.corp.adobe.com (nahub02.corp.adobe.com [10.8.189.98]) by inner-relay-1.corp.adobe.com (8.12.10/8.12.10) with ESMTP id r2LKwqAV001270 for ; Thu, 21 Mar 2013 13:58:52 -0700 (PDT) Received: from nambx05.corp.adobe.com ([10.8.189.124]) by nahub02.corp.adobe.com ([10.8.189.98]) with mapi; Thu, 21 Mar 2013 13:58:52 -0700 From: Gordon Smith To: "dev@flex.apache.org" Date: Thu, 21 Mar 2013 13:58:49 -0700 Subject: RE: [OT] Log history Thread-Topic: [OT] Log history Thread-Index: Ac4mO8hTuh/gMN6uT+C7nxBeLC4R8QAOtnEw Message-ID: <149F8129B58B2D418508E63117D9C5419BDE675D67@nambx05.corp.adobe.com> References: <76351875-298E-4739-B349-3CD9BB79FECE@classsoftware.com> <2A763D83-341D-4E95-A090-A98B6B47E473@classsoftware.com> <544B2D40-22AB-44B5-A7F7-D6781BE3B819@classsoftware.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="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org I followed this only up to the point you did 'git hist'. My git (1.7.12.4) = has no such command. - Gordon -----Original Message----- From: Fr=E9d=E9ric THOMAS [mailto:webdoublefx@hotmail.com]=20 Sent: Thursday, March 21, 2013 6:55 AM To: dev@flex.apache.org Subject: Re: [OT] Log history Justin, coming back to your first commit, I want to show you the different = possibilities you had, I used my git lab to do that, it's like you have a c= omputer and me too. U:\gitLab\work\asf\flex\testWorkFlow\justin>git branch * develop master --------------------------------- You add locales --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\justin>git checkout -b test_Rebased_Ho= tfix_Without_Conflic Switched to a new branch 'test_Rebased_Hotfix_Without_Conflic' U:\gitLab\work\asf\flex\testWorkFlow\justin>md locales U:\gitLab\work\asf\flex\testWorkFlow\justin>cd locales U:\gitLab\work\asf\flex\testWorkFlow\justin\locales>copy /y nul > pt_PT.pro= perties U:\gitLab\work\asf\flex\testWorkFlow\justin\locales>echo "some portugues" >= pt_PT.properties U:\gitLab\work\asf\flex\testWorkFlow\justin\locales>git add . U:\gitLab\work\asf\flex\testWorkFlow\justin\locales>git commit -m "Added pt= _PT" [test_Rebased_Hotfix_Without_Conflic b05fdd8] Added pt_PT 1 file changed, 1 insertion(+) create mode 100644 locales/pt_PT.properties U:\gitLab\work\asf\flex\testWorkFlow\justin\locales>git hist * b05fdd8 2013-03-21 | Added pt_PT (HEAD, test_Rebased_Hotfix_Without_Conflic) [Justin] * 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/= develop, origin/HEAD, master, develop) [Fr=E9d=E9ric THOMAS] --------------------------------- In between, Fred updated the README --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\fred>git branch * develop master U:\gitLab\work\asf\flex\testWorkFlow\fred>echo "Updated README" >> README U:\gitLab\work\asf\flex\testWorkFlow\fred>type README This file is supposed= to be updated once this repository has been copied."Updated README" U:\gitLab\work\asf\flex\testWorkFlow\fred>git add . U:\gitLab\work\asf\flex\testWorkFlow\fred>git commit -m "Updated the README= " [develop f43029d] Updated the README 1 file changed, 1 insertion(+), 1 deletion(-) U:\gitLab\work\asf\flex\testWorkFlow\fred>git hist * f43029d 2013-03-21 | Updated the README (HEAD, develop) [Fr=E9d=E9ric THO= MAS] * 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/= develop, origin/HEAD, master) [Fr=E9d=E9ric THOMAS] U:\gitLab\work\asf\flex\testWorkFlow\fred>git pull --rebase Current branch = develop is up to date. U:\gitLab\work\asf\flex\testWorkFlow\fred>git push Counting objects: 5, don= e. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 303 bytes, done. Total 3 (delta 1), reused 0 (delta 0) To U:/gitLab/work/asf/flex/testWorkFlow/..\flex-sdk.git 1032fa2..f43029d develop -> develop --------------------------------- You get the newest changes --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\justin>git pull --rebase origin develo= p From U:/gitLab/work/asf/flex/testWorkFlow/..\flex-sdk * branch develop -> FETCH_HEAD First, rewinding head to replay your work on top of it... Applying: Added pt_PT --------------------------------- Look, that's the state you're going to have on the remote if you do: git merge test_Rebased_Hotfix_Without_Conflic git push --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\justin>git hist * 54072f3 2013-03-21 | Added pt_PT (HEAD, test_Rebased_Hotfix_Without_Conflic) [Justin] * f43029d 2013-03-21 | Updated the README (origin/develop) [Fr=E9d=E9ric TH= OMAS] * 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/= HEAD, master, develop) [Fr=E9d=E9ric THOMAS] --------------------------------- But here, if you decide to let the others know the all work you did on this= branch, we do a merge without fast forward. --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\justin>git merge --no-ff test_Rebased_= Hotfix_Without_Conflic Merge made by the 'recursive' strategy. README | 2 +- locales/pt_PT.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 locales/= pt_PT.properties U:\gitLab\work\asf\flex\testWorkFlow\justin>git hist * 5cd6098 2013-03-21 | Merge branch 'test_Rebased_Hotfix_Without_Conflic'= =20 into develop (HEAD, develop) [Justin] |\ | * 54072f3 2013-03-21 | Added pt_PT=20 |(test_Rebased_Hotfix_Without_Conflic) [Justin] | * f43029d 2013-03-21 | Updated the README (origin/develop) [Fr=E9d=E9ric THOMAS] |/ * 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/= HEAD, master) [Fr=E9d=E9ric THOMAS] --------------------------------- But actually, because it was a simple commit, you revert your merge to have= a flat history and push it --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\justin>git reset --hard 54072f3 HEAD i= s now at 54072f3 Added pt_PT U:\gitLab\work\asf\flex\testWorkFlow\justin>git hist * 54072f3 2013-03-21 | Added pt_PT (HEAD, test_Rebased_Hotfix_Without_Confl= ic, develop) [Justin] * f43029d 2013-03-21 | Updated the README (origin/develop) [Fr=E9d=E9ric TH= OMAS] * 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/= HEAD, master) [Fr=E9d=E9ric THOMAS] U:\gitLab\work\asf\flex\testWorkFlow\justin>git push Counting objects: 5, d= one. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (4/4), 351 bytes, done. Total 4 (delta 0), reused 0 (delta 0) To U:/gitLab/work/asf/flex/testWorkFlow/..\flex-sdk.git f43029d..54072f3 develop -> develop --------------------------------- On my machine, I update and I see a clean ordered history --------------------------------- U:\gitLab\work\asf\flex\testWorkFlow\fred>git pull --rebase remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 4 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (4/4)= , done. >From U:/gitLab/work/asf/flex/testWorkFlow/..\flex-sdk f43029d..54072f3 develop -> origin/develop First, rewinding head to replay your work on top of it... Fast-forwarded develop to 54072f3f207612429d525c6854632b265996bf9e. U:\gitLab\work\asf\flex\testWorkFlow\fred>git hist * 54072f3 2013-03-21 | Added pt_PT (HEAD, origin/develop, develop) [Justin] * f43029d 2013-03-21 | Updated the README [Fr=E9d=E9ric THOMAS] * 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/= HEAD, master) [Fr=E9d=E9ric THOMAS]