remote-bzr: add support to push merges
commitf38dfc4c32507de2f7cf05350fe8b34fd4edd45d
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 1 May 2013 01:09:57 +0000 (30 20:09 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 May 2013 05:06:46 +0000 (30 22:06 -0700)
tree50fa722a7bc32ffe22409d4c00a6ec432137a4b0
parent715d64fe99885a37c38aff75eebfaf42b669d914
remote-bzr: add support to push merges

In order to do that, we need to store the marks of every file, so that
they can be fetched when needed. Unfortunately we can't tell bazaar that
nothing changed, we need to send the data so that it can figure it out
by itself.

And since it will be requesting a bunch of information by the file_id,
it's better to have a helper dict (rev_files), so that we can fetch it
quickly.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/remote-helpers/git-remote-bzr
contrib/remote-helpers/test-bzr.sh