From: Hin-Tak Leung Date: Tue, 28 Oct 2014 23:59:02 GMT Subject: Re: differences between old clone and new Re: git-svn performance Message-ID: <1414540742.41763.YahooMailBasic@web172305.mail.ir2.yahoo.com> In-Reply-To: <20141028074104.GA7762@dcvr.yhbt.net> On Tue, 28/10/14, Eric Wong wrote: > So both merges are correct, but we lose one, and gain one? I'll try to check more closely tomorrow.  Can you point out the exact revisions in the R repo?  Thanks. The missing merge on branch "R-2-14-branch" is: commit 93af4d4cc3a5e0039944dd4e340d26995be8a252 Merge: 121990f 6ff1b87 Author: ripley Date: Wed Feb 22 13:45:34 2012 +0000 port r58453 from trunk git-svn-id: https://svn.r-project.org/R/branches/R-2-14-branch@58454 00db46b3-68df-0310-9c12-caf00c1e9a41 121990f is R-2-14-branch@58449, 6ff1b87 is trunk@58453, but the two branches are only identical up to and including R-2-14-branch@57129 - i.e. trunk@57130 appears in my old clone's "R-2-14-branch" git log but not in the new clone's. The extra merge in the new clone is in branch "djm-parseRd": commit 6d93330f7637eb4da81adaea58454c6b43da1c65 Merge: f503a9d 23deade Author: murdoch Date: Thu Nov 13 14:24:17 2008 +0000 Update from trunk to r46923 git-svn-id: https://svn.r-project.org/R/branches/djm-parseRd@46925 00db46b3-68df-0310-9c12-caf00c1e9a41 You can look up f503a9d (djm-parseRd@46922) and 23deade (trunk@46923) yourself. The two branches' git log agree up to and including djm-parseRd@46659 . Hmm, the new "djm-parseRd" branch actually have *two* extra merges, the earlier extra is: commit 1e8174c797ba8471d604e89e4d614ad969b93b72 Merge: 55a1d9b 72744ab Author: murdoch Date: Tue Nov 11 21:17:06 2008 +0000 Merge trunk changes to r46902 git-svn-id: https://svn.r-project.org/R/branches/djm-parseRd@46906 00db46b3-68df-0310-9c12-caf00c1e9a41