]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 38e7167) | patch
remote-bzr: fix partially pushed merge
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 1 May 2013 01:09:59 +0000 (20:09 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 May 2013 05:06:47 +0000 (22:06 -0700)
commitb25df87fad2b12349a55146d5c87625109a58221
treed406fb7a111bd80b0fa22951a8dad4edef7dbb33tree | snapshot
parent38e7167e9bdc57262c7298912c4bf9df4d68f6fecommit | diff
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>
contrib/remote-helpers/git-remote-bzr diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.