Re: caPutLog support for gateway

[Andrew Johnson <anj@aps.anl.gov>]

Hi Martin,

On 04/02/2014 01:14 PM, Konrad, Martin wrote:
> can anyone explain why Launchpad always screws up the merge request (it 
> seems to me like it tries to re-merge the whole history)?

I think the problem is that you didn't start from a checkout of the
official lp:epics-gateway branch, or somehow your branch lost the
original Bazaar revision history. The revision IDs for the commits to
the two repo's don't match although the dates do; for revno 180 the
original commit is:

Committer: Janet B. Anderson
Date: 2011-04-05 21:28:22 UTC
Revision ID: jba@aps.anl.gov-20110405212822-c3bp3k2ezfv4xy8c
Committed freebsd portability changes contributed by Gerrit Kuhn.

http://bazaar.launchpad.net/~epics-core/epics-gateway/trunk/revision/180

while yours is

Committer: Janet B. Anderson
Date: 2011-04-05 21:28:22 UTC
Revision ID: git-v1:99d906eb3218ad614e0684082cf9f46c6bf5f15f
Committed freebsd portability changes contributed by Gerrit Kuhn.

http://bazaar.launchpad.net/~info-martin-konrad/epics-gateway/putlog/revision/180

I don't know where you got your branch from, but from the ID it looks
like it involved git somehow. Bazaar and Launchpad see these two commits
as being completely different, even though they have identical content.

To fix this I would generate a patch from for the last commit to your
tree and apply it to a fresh checkout of the launchpad original, then
throw away your branch completely.

(I stopped your merge proposal from going out to the core-talk list
because it had a useless 600KB diff attached to it).

- Andrew
-- 
Advertising may be described as the science of arresting the human
intelligence long enough to get money from it. -- Stephen Leacock