flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gordon Smith <gosm...@adobe.com>
Subject RE: [OT] Log history
Date Thu, 21 Mar 2013 20:58:49 GMT
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édéric THOMAS [mailto:webdoublefx@hotmail.com] 
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 computer 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_Hotfix_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.properties

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édéric 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édéric THOMAS]
* 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/develop, origin/HEAD,
master) [Frédéric 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, done.
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 develop 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édéric THOMAS]
* 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/HEAD, master, develop)
[Frédéric 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' 
into develop (HEAD, develop) [Justin]
|\
| * 54072f3 2013-03-21 | Added pt_PT 
|(test_Rebased_Hotfix_Without_Conflic)
[Justin]
| * f43029d 2013-03-21 | Updated the README (origin/develop) [Frédéric
THOMAS]
|/
* 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/HEAD, master) [Frédéric
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 is 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_Conflic, develop) [Justin]
* f43029d 2013-03-21 | Updated the README (origin/develop) [Frédéric THOMAS]
* 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/HEAD, master) [Frédéric
THOMAS]

U:\gitLab\work\asf\flex\testWorkFlow\justin>git push Counting objects: 5, done.
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édéric THOMAS]
* 1032fa2 2013-03-21 | Added README (origin/release, origin/master, origin/HEAD, master) [Frédéric
THOMAS]


Mime
View raw message