Mailing-List: contact dev-help@flex.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@flex.apache.org
Received-SPF: pass (athena.apache.org: domain of webdoublefx@hotmail.com
 designates 157.55.2.109 as permitted sender)
Message-ID: <DUB118-DS1481BC694F5D5C5082EACFB4CD0@phx.gbl>
From: =?iso-8859-1?Q?Fr=E9d=E9ric_THOMAS?= <webdoublefx@hotmail.com>
To: <dev@flex.apache.org>
References: <9F6EF460-1153-4520-94A3-ACE6A0F93816@classsoftware.com>
 <DUB118-DS7CB3B87B3C4BFE7CC4605B4CC0@phx.gbl>
 <49E60C0C-54AA-4FC0-98F4-42ED57636107@classsoftware.com>
 <DUB118-DS16B296F1C6953AB6479E32B4CC0@phx.gbl>
 <39763F94-758F-4EF3-A38E-901CD7531B51@classsoftware.com>
 <DUB118-DS259F8D7196EE24B46804B0B4CD0@phx.gbl>
 <DUB118-DS2307FCE26A6F5FF088C87CB4CD0@phx.gbl>
In-Reply-To: <DUB118-DS2307FCE26A6F5FF088C87CB4CD0@phx.gbl>
Subject: Re: Git merge of README and RELEASE_NOTES
Date: Tue, 16 Apr 2013 04:04:46 +0200
MIME-Version: 1.0
Content-Type: text/plain;
	format=flowed;
	charset="iso-8859-1";
	reply-type=response
Content-Transfer-Encoding: 8bit
Importance: Normal

and I just noticed as well, to check the diff on RELEASE_NOTES, use: git 
diff origin/release4.9 RELEASE_NOTES

-----Message d'origine----- 
From: Fr�d�ric THOMAS
Sent: Tuesday, April 16, 2013 3:31 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES

Re wrote a bit better I hope:

As I said before, in git merge or rebase will apply only on commits, not on
files, if you have files with conflicts you want to merge, you will have to
go by an intermediary branch (temp), checkout the files you want to merge
from the branch where they are, add and commit them into the temp branch, it
will indeed add and commit files only if they are different, once committed
on a temp branch, from the develop branch you can do a git rebase, it will
stop the rebase operation on conflicts, you can then use a mergeTool if it
has been configured, you can then continue the rebase.

-Fred

-----Message d'origine----- 
From: Fr�d�ric THOMAS
Sent: Tuesday, April 16, 2013 3:23 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES

> If we want to merge the entire tree would we follow the same process? (eg 
> like what we have to do after a release) Do you have to do a git mergeTool 
> on every file?

As I said before, in git merge or rebase will apply only on commits, not on
files, if you have files with conflicts you want to merge, you will have to
go by an intermediary branch checkout the files you want from the branch
they are, add commit them, it will indeed add and commit only if the files
are different, once committed on this temp branch, from the develop branch
you can do a git rebase, it will stop the rebase operation on conflicts, you
can then you a mergeTool if it has been configured, you can then continue
the rebase.

Obviously, if you merge or rebase an entire branch, you don't need to go by
an intermediary branch.

The good trick is to make your commits atomic, like that, you can
merge/rebase this particular commit.

> OK I ran "git checkout origin/release4.9 RELEASE_NOTES README" and a "git 
> status" only show README changed, however "git diff README" shows no 
> changes, ignoring that I continue.

that means only README was changed, you can see the diff running git
diff --cached README, apparently the RELEASE_NOTES README are the same, you
can check that running git diff develop..release4.9 RELEASE_NOTES

> git add -u

Means add all my untracked files and the stages ones, that's the reason why
I ask you to be on a clean develop branch.

> A bit scary: 1 file changed, 36 insertions(+), 63 deletions(-) .

See the previous answer.

And for the rest, it comes from what I just explained, the only thing wrong
in what I wrote was 'git branch -d temp' instead of ''git branch -D temp'.

-Fred

-----Message d'origine----- 
From: Justin Mclean
Sent: Tuesday, April 16, 2013 2:39 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES

Hi,

> ok, so, you need to go by an intermediary branch as git merge or rebase 
> only commits

It there a simpler way of doing this? In svn it just a "svn merge" followed
by a "svn ci" - assuming you're happy with the merge.

If we want to merge the entire tree would we follow the same process? (eg
like what we have to do after a release) Do you have to do a git mergeTool
on every file?

Lets give that a try:

> git checkout -b temp
> git checkout origin/release4.9 RELEASE_NOTES <FILE2> <FILEX>

OK I ran "git checkout origin/release4.9 RELEASE_NOTES README" and a "git
status" only show README changed, however "git diff README" shows no
changes, ignoring that I continue.

> git add -u

Why is "-u" needed?

> git commit -m "Merge RELEASE_NOTES, etc.. from release4.9 branch"

A bit scary:
1 file changed, 36 insertions(+), 63 deletions(-)

Why did it do this when "git diff" showed no changes?

> git checkout develop

Switched to branch 'develop'
Your branch is ahead of 'origin/develop' by 1 commit.
  (use "git push" to publish your local commits)

Think that's OK.

> git rebase temp

At this point if I do a git status I get:
# On branch develop
# Your branch is ahead of 'origin/develop' by 2 commits.
#   (use "git push" to publish your local commits)
#
nothing to commit, working directory clean

Which is a little strange as I would of expected changed from the "git
checkout develop".

> git mergeTool RELEASE_NOTES

Gives "No files need merging"

So I assume no need to to do a  "git rebase --continue"?

Try "git mergeTool README" and I also get "No files need merging"

This is not what I expected I know it made changes to the file in the commit
above.

git status give at this point:
# On branch develop
# Your branch is ahead of 'origin/develop' by 2 commits.
#   (use "git push" to publish your local commits)
#
nothing to commit, working directory clean

What are here 2 commits when I've only done one?

> git branch -d temp
deletes branch

If at this point if I do this "git diff --stat origin/develop" I get:
README        | 99
++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
RELEASE_NOTES | 26 +++++++++++++++++++++++++-

Why is it saying both README and RELEASE_NOTES have changed when only one
file was changed with the commit?

Looking at the changes (via "git diff origin/develop") to README I see that
it has merged the files incorrectly and certainly not what I expected. It's
removed the more recent changes about FP 11.7 and AIR 3.7, using git rather
than svn and changes to TLF but it did add the single line that changed the
version number 4.9 to 4.9.1. RELEASE_NOTES have similar issues. Why did this
not merge as expected?

Why did "git mergeTool" say in both cases "No files need merging" when it
obviously has (incorrectly) merged the files?

Obviously Im not an expert git user and just know enough to keep getting
myself into trouble. :-) I am just trying to understand what is going on
here as currently it really doesn't make any sense to me at all and worse
looks like it done the merge mostly in reverse?

Thanks,
Justin