Re: [gnome-desktop-testing] Using Launchpad as the main repository

[John Carr <john carr unrouted co uk>]

I was involved in bzr-git development (which is used for this LP
feature). LP won't be able to automatically push to GNOME Git, it
works the other way around, any pushes to Git will be reflected on LP.
Two way mirroring is something i bike shedded about for GNOME before
we moved to Git and its problematic...

You can use bzr-git to work against both bzr branches and git branches.

However...

The mapping between Git and Bzr is not perfect. Whilst i was of the
opinion the mapping was sufficient to be able to provide a git server
that stored everything in bazaar and provided git and bzr access to
the same repository, if you try to work in both Git and Bzr you will
come unstuck.

Not sure how the code has progressed but i believe the only supported
push mechanism is dpush which will by default rebase after a push so
that the contents of your bzr branch matches the git repository. If
you have shared the bzr hosted code with someone and then push your
branch will now be diverged from the copy of your branch. You can turn
off rebasing but this just causes the problem in the other direction..

John

On Thu, May 28, 2009 at 9:16 AM, Eitan Isaacson <eitan ascender com> wrote:
> I did some local tests with git-bzr, but if the LP feature is writable
> (ie. push to the bzr branch, and it pushes to git's origin), than this
> is a perfect solution.
>
> On Thu, May 28, 2009 at 10:13 AM, Ara Pulido <ara ubuntu com> wrote:
>> Yes,
>>
>> SVN is now deprecated in GNOME, GIT is now used.
>>
>> So, yes, we should move to a GIT import (eventually).
>>
>> Cheers,
>> Ara.
>>
>> Javier Collado wrote:
>>>
>>> Hello,
>>>
>>> I've just seen this:
>>> http://blog.launchpad.net/code/git-branch-imports-now-in-public-beta
>>>
>>> and I'm wondering if it would make things easier to have a git import
>>> instead of
>>> a svn import. What do you think?
>>>
>>> Best regards,
>>>    Javier
>>>
>>> Eitan Isaacson wrote:
>>>
>>>>
>>>> Yeah, it has been fairly complicated...
>>>>
>>>> I think we should keep the upstream/distro-neutral codebase. It would
>>>> just require a bit of discipline, if we keep just this one rule, maybe
>>>> it will be manageable:
>>>> - Merges go just one direction, from the GNOME tree to the LP tree.
>>>>
>>>> And from that the following is derived:
>>>> - Anything that is not Ubuntu-specific should go directly to the GNOME
>>>> git tree.
>>>> - Non-GNOME module tests should go to the LP bzr tree.
>>>>
>>>> I am not volunteering for any special roles here, so those are just my
>>>> 2c :)
>>>>
>>>> On Wed, 2009-05-06 at 16:11 +0200, Ara Pulido wrote:
>>>>
>>>>>
>>>>> Hello all,
>>>>>
>>>>> Since we started the project in GNOME SVN very little (or none)
>>>>> contribution is being made directly to Subversion. Everybody keeps using
>>>>> the Launchpad ubuntu-desktop-testing project [1].
>>>>>
>>>>> I think this is because most of the people that started to collaborate
>>>>> in this project started through Ubuntu and the project was more advanced
>>>>> there. Also, not having to provide patches, makes it much easier for new
>>>>> comers to start collaborating with the project.
>>>>>
>>>>> So, my proposal is:
>>>>>
>>>>> Should we change the Ubuntu Desktop Testing project in Launchpad to be
>>>>> called just Desktop Testing and point in the GNOME documentation to this
>>>>> Launchpad project.
>>>>>
>>>>> If, later on, some one want to set up a GIT module to maintain, that's
>>>>> fine, you could use something like git-bzr [2] to be synchronized.
>>>>> What do you guys think?
>>>>> Thanks,
>>>>> Ara.
>>>>>
>>>>> [1] https://code.launchpad.net/ubuntu-desktop-testing
>>>>> [2] http://github.com/pieter/git-bzr/tree/master
>>>>>
>>>>> _______________________________________________
>>>>> http://live.gnome.org/DesktopTesting
>>>>> desktop-testing-list mailing list
>>>>> desktop-testing-list gnome org
>>>>> http://mail.gnome.org/mailman/listinfo/desktop-testing-list
>>>>>
>>>>
>>>> _______________________________________________
>>>> http://live.gnome.org/DesktopTesting
>>>> desktop-testing-list mailing list
>>>> desktop-testing-list gnome org
>>>> http://mail.gnome.org/mailman/listinfo/desktop-testing-list
>>>>
>>>>
>>>
>>>
>>
>>
>>
> _______________________________________________
> http://live.gnome.org/DesktopTesting
> desktop-testing-list mailing list
> desktop-testing-list gnome org
> http://mail.gnome.org/mailman/listinfo/desktop-testing-list
>