On Sun, 2011-03-13 at 04:02 +0000, Eli Zaretskii wrote: > Seems so: > > D:\gnu\bzr\idutils>bzr git-objects 802eb1d3b0f18993e882369cf02452ded696897c > tree ca8cc72963b395e49271f23d436ecc561868c3ff > parent 9432121c2ddc629db098b8d194275e0f8a1ce270 > author Jim Meyering <email address hidden> 826693640 +0000 > committer Jim Meyering <email address hidden> 826693640 +0000
summary "ensure base was bzr-git generated when applying deltas" status triaged importance medium
This looks like it is indeed a clash between the revisions generated by bzr-git and bzr-fastimport.
Cheers,
Jelmer
On Sun, 2011-03-13 at 04:02 +0000, Eli Zaretskii wrote: bzr\idutils> bzr git-objects 802eb1d3b0f1899 3e882369cf02452 ded696897c 49271f23d436ecc 561868c3ff db098b8d194275e 0f8a1ce270
> Seems so:
>
> D:\gnu\
> tree ca8cc72963b395e
> parent 9432121c2ddc629
> author Jim Meyering <email address hidden> 826693640 +0000
> committer Jim Meyering <email address hidden> 826693640 +0000
summary "ensure base was bzr-git generated when applying deltas"
status triaged
importance medium
This looks like it is indeed a clash between the revisions generated by
bzr-git and bzr-fastimport.
Cheers,
Jelmer