[Adium-devl] bzr instead of hg?

[Felipe Contreras]

On Thu, Jun 19, 2008 at 5:26 AM, Evan Schoenberg <evan.s at dreskin.net> wrote:
>
>
> On Jun 18, 2008, at 7:32 PM, Peter Hosey <prh at boredzo.org> wrote:
>
>> On Jun 18, 2008, at 16:08:30, Felipe Contreras wrote:
>>> On Thu, Jun 19, 2008 at 1:59 AM, Peter Hosey <prh at boredzo.org> wrote:
>>>> Advantages:
>>>>
>>>> - msn-pecan uses bzr
>>>>
>>> Nope, msn-pecan uses git.
>>
>> Rats. I didn't look at your Launchpad URL; I just assumed that you
>> were using it for versioning, too. I guess you just use it for bug-
>> tracking, then?
>>
>>> AFAIK bzr support for svn is quite good, just like git's.
>>
>> It's bad, just like Tailor's. By "bad", I mean that it can't hand
>> le
>> a commit that touches multiple branches (e.g., trunk and a branch at
>> the same time).
>>
>> However, as I said, it's been a long time since I tried to convert our
>> repo to Bazaar, so maybe they fixed this. (I kinda doubt it, but as I
>> said, we should probably check.)
>>
>>> BTW, my mtn->git script is basically done, so soon I'll publish an
>>> exact replica of Pidgin's mtn repo in git.
>>
>> That would be helpful. Git has some disadvantages, though:
>>
>> 1. Harder to learn (less svn-like and some bigger paradigm differences
>
> Yeah, I deleted and recloned my MSN-pecan clone (checkout) this
> morning after half an hour of anger trying to do a simple update.

That's probably my fault. I did a rebase and fixed some commits that I
had already pushed, effectively screwing the repos of everyone that
had a clone, which I thought where not that many.

I will do that one last time to fix some issues in the repo and then I
promise not to do it again :)

Anyway: git pull --foce

-- 
Felipe Contreras