Re: [PATCH] remote-bzr: update old organization

From: Junio C Hamano <gitster@pobox.com>
Date: May 14, 2013, 17:30 UTC
Message-ID: <7v1u99lb8w.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1368505227-16661-1-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 6 quoted lines

> If a clone exists with the old organization (v1.8.2) it will prevent the
> new shared repository organization from working, so let's remove this
> repository, which is not used any more.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---

What happens with and without this patch to an existing user from 1.8.2 days, when she does what?

A sample answer (to show the level of descriptiveness, not the content, I am epecting) might go something like "Because the organization is different, it will barf whenever she tries to incrementally update from the other side. By removing the old one 1.8.3 contrib/ does not understand, at least we can unstuck her; she ends up reimporting the whole history, though."

Trying to see if this is a 1.8.3 "fast-track" material.

Show 21 quoted lines

>  contrib/remote-helpers/git-remote-bzr | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
> index 3e452af..b295dd4 100755
> --- a/contrib/remote-helpers/git-remote-bzr
> +++ b/contrib/remote-helpers/git-remote-bzr
> @@ -830,6 +830,13 @@ def get_repo(url, alias):
>          clone_path = os.path.join(dirname, 'clone')
>          if not os.path.exists(clone_path):
>              os.mkdir(clone_path)
> +        else:
> +            # check and remove old organization
> +            try:
> +                bdir = bzrlib.bzrdir.BzrDir.open(clone_path)
> +                bdir.destroy_repository()
> +            except bzrlib.errors.NotBranchError:
> +                pass
>  
>      try:
>          repo = origin.open_repository()