Re: [Python-Dev] Subversion branch merging

2007-07-15 Thread Dave Harrison
Martin v. Löwis wrote: >> That said, there are always strong arguments in >> favour of the distributed model encouraging and fostering community >> dev participation > > Just for the record: Python's development model *is* distributed, > and has been for a long time. We don't all work in the same

Re: [Python-Dev] Subversion branch merging

2007-07-13 Thread Dave Harrison
Thomas Wouters wrote: > > On 7/12/07, *Dave Harrison* <[EMAIL PROTECTED] > <mailto:[EMAIL PROTECTED]>> wrote: > > So far I've used DARCS, Hg, and Git. And at this point Git is far and > away the winner. > > > Let's not start a dis

Re: [Python-Dev] Subversion branch merging

2007-07-13 Thread Dave Harrison
>> It also has some really cool features like "rebasing" for letting >> your branch actively track the trunk from which you branched it. > > Unfortunately, rebasing doesn't seem to be stable yet. Sometimes it > works for me, sometimes not. I don't know whether its because I > don't know what I'm

Re: [Python-Dev] Subversion branch merging

2007-07-12 Thread Dave Harrison
Brett Cannon wrote: > On 7/12/07, "Martin v. Löwis" <[EMAIL PROTECTED]> wrote: >> I'm tasked with performing a number of merge operations across >> various Python branches. Can somebody please share a command >> line that I should use to continue with the merge tracking that >> has been used? Is th