| commit | b25df87fad2b12349a55146d5c87625109a58221 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Wed, 1 May 2013 01:09:59 +0000 (30 20:09 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 May 2013 05:06:47 +0000 (30 22:06 -0700) | ||
| tree | d406fb7a111bd80b0fa22951a8dad4edef7dbb33 | treesnapshot (tar.gz zip) |
| parent | 38e7167e9bdc57262c7298912c4bf9df4d68f6fe | commitdiff |
remote-bzr: fix partially pushed merge
If part of the merge was already pushed, we don't have the blob_marks
available, however, the commits are already stored in bazaar, so we can
use the revision_tree to fetch the contents.
We want to do this only when there's no other option.
There's no easy way to test this.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If part of the merge was already pushed, we don't have the blob_marks
available, however, the commits are already stored in bazaar, so we can
use the revision_tree to fetch the contents.
We want to do this only when there's no other option.
There's no easy way to test this.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/remote-helpers/git-remote-bzr | diffblobblamehistory |