Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
> On Wed, Nov 28, 2012 at 11:38 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
>>
>>> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
>>> ---
>>> contrib/remote-helpers/git-remote-bzr | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
>>> index 2c05f35..5b89a05 100755
>>> --- a/contrib/remote-helpers/git-remote-bzr
>>> +++ b/contrib/remote-helpers/git-remote-bzr
>>> @@ -571,6 +571,8 @@ def do_export(parser):
>>> repo.generate_revision_history(revid, marks.get_tip('master'))
>>> revno, revid = repo.last_revision_info()
>>> peer.import_last_revision_info_and_tags(repo, revno, revid)
>>> + wt = peer.bzrdir.open_workingtree()
>>> + wt.update()
>>> print "ok %s" % ref
>>> print
>>
>> Shouldn't this be squashed as part of one of the earlier patches?
>> The split between 1/7 (import first) and 2/7 (then support export)
>> makes sense, but this one looks more like "oops, we forgot to touch
>> the working tree while updating the history in the previous steps
>> and here is a fix" to me.
>
> Perhaps. It's not really clear if we should update the working tree at
> all. A 'git push' doesn't update the working directory on the remote,
> but a 'bzr push' does. I thought it was better to leave this
> distinction clear, in case this becomes an issue later on.
If you explained that in the log message, then we would have avoided
this exchange, and more importantly, if you had a in-code comment
there, it may help people who later want to add a knob to leave the
working tree intact. The seed you sow now to help others, who may
be less skillful and knowledgeable than you are, will help the
project in the longer term.
Thanks. I don't mind rephrasing that four lines and amend the
log message of what I have in 'pu', if that is what you want.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html