On Fri, Nov 19, 2010 at 23:15:51 +0800, Dowlin Yang wrote:
> I sent an email earlier but it seems rejected. I resent again with plain
> text format. I am sorry for any inconvenience if you receive my messages
> twice, and please read the new one.
If it was HTML it was rejected by the list software and nobody ever saw it.
HTML is not accepted by any of the lists on vger.kernel.org.
> Suppose A had a branch b1 and B had a branch b2. They work on their own
> branch separately but b1 and b2 share the same file f1. Suppose A made
> a few changes to f1 on Nov 5th.
Dates are irrelevant. What is the most recent common ancestor?
Note, that most recent common ancestor is such commit, that is reachable from
both branches ("common ancestor") and it is not reachable from any other
common ancestor ("most recent"). No mention of dates anywhere -- just
parent-child relation between commits.
> Here are A's changes:
> [snip]
> A removed one line and added a few lines to f1 and then committed on Nov
> 5th.
>
> On the other hand, B made a few changes to f1 too on the next day Nov 6th.
> Here are B's changes:
> [snip]
> B removed a few lines and then committed on Nov 6th.
>
> They kept updating other files in the following days. After a few days, we
> decide to merge A's branch b1 with B's branch b2. So A did git pull origin
> b2 in b1, and the expected resultant file is sth like this:
> [snip]
Now git -- and for that matter any other version control system out there
that ever had a merge command -- looks for the most recent common ancestor.
Let's call it 'a'(1).
Now git applied both changes from a to b1 and changes from a to b2. It uses
the 3-way merge algorithm, which is basically:
- match up all lines that are the same in all three versions
- for lines where a and b1 is the same, take b2
- for lines where a and b2 is the same, take b1
- for lines where b1 and b2 are the same, take b1 (== b2)
- for lines where a, b1 and b2 all differ, declare conflict
You can equally think about this algorithm as applying diff from a to b1 to
b2 or applying diff from a to b2 to b1. All should give the same results(2).
For adding/removing files, just think of the tree as file listing what files
are included (where order is ignored, so the same name is always matched up).
The individual changes are not considered, ever. Only the sum of changes
since most recent common ancestor on one and the other side.
> Aren't newer changes supposed to be applied? Why older changes are the
> final results?
No. All changes since branch point or last merge are applied.
> B's b2 branch had com/category_bar.js added earlier than A's b1. A manually
> added the same changes to b1 on Nov 5th, but later B decided to remove
> com/category_bar.js from b2 on Nov 6h as I described.
b2 had category_bar.js added and removed again, so in the end it had no
changes in category_bar.js
b1 had category_bar.js added
No change (between a and b2) versus addition (between a and b1) is addition.
So category_bar.js is added in the result.
If you didn't add category_bar.js independently on b1, but instead pulled
from b2, the pulled revision would have been most recent common ancestor, so
b1 would see no further change and b2 would see deletion and result would be
deletion.
Footnotes:
~~~~~~~~~~
1) You can query most recent common ancestor with 'git merge-base b1 b2'.
You can view/list all commits from common ancestor to b2 with 'b1..b2'
refspec to gitk/git log. You can view/list all commits from common
ancestor to both b1 and b2 with 'b1...b2' refspec to gitk/git log. You can
get the cumulative diff from common ancestor to b2 with 'git diff
b1...b2'.
2) Unless there are conflicts or a repeated text, in which case patch
application (with limited context) would not have enough information on
where to apply while 3-way merge would.
--
Jan 'Bulb' Hudec <bulb@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html