Re: [Python-Dev] Subversion branch merging

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

> 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 office, or even in the same time

Re: [Python-Dev] Subversion branch merging

Thomas Wouters wrote: > > On 7/12/07, *Dave Harrison* <[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 discussion on which DVCS is better, or I'd burn your > ears

Re: [Python-Dev] Subversion branch merging

On 7/12/07, Dave Harrison <[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 discussion on which DVCS is better, or I'd burn your ears off about all the ways each of those (as well as Bazaar, Arch/tla/bzr1, Arx,

Re: [Python-Dev] Subversion branch merging

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 13, 2007, at 4:04 PM, Giovanni Bajo wrote: > I can't speak of bzr. I don't use or even have Windows, but this page says there are native Windows binaries available (yes Bazaar is pure Python): http://bazaar-vcs.org/BzrOnPureWindows There's

Re: [Python-Dev] Subversion branch merging

On 7/12/07, Brett Cannon <[EMAIL PROTECTED]> wrote: I do know, though, that Thomas kept talking about moving us over to Bazaar (or some distributed VCS) and instead of having a ton of svn branches we have distributed VCS branch for each feature in Py3K. That way the VCS's strong merge system wou

Re: [Python-Dev] Subversion branch merging

On 13/07/2007 14.23, Steve Holden wrote: >> I can't speak to how easily any of these cross over to the windows >> platform, although none of them seem to be overly windows friendly >> (YMMV). But I presume this would be one of the key problems facing a >> distributed versioning system by the pyth

Re: [Python-Dev] Subversion branch merging

On 7/13/07, Facundo Batista <[EMAIL PROTECTED]> wrote: 2007/7/13, Barry Warsaw <[EMAIL PROTECTED]>: > with merges. This means the end of posting patches because instead > what you would do is post the url to a branch that you published some > place. It means that branch can be kept up-to-date

Re: [Python-Dev] Subversion branch merging

Am Fri, 13 Jul 2007 12:58:24 -0500 schrieb [EMAIL PROTECTED]: > > Barry> Silly me, the trunk is already available: > > Barry> https://code.launchpad.net/~vcs-imports/python/trunk > > Bazaar keeps this in sync with svn.python.org? > [...] Yes, the branch is update regularly. I think it'

Re: [Python-Dev] Subversion branch merging

> Should the community ever decide to make the switch The last time, I was asked to write a PEP. I would demand the same thing the next time such a switch is suggested. I would be -1 on any proposed switch to a system that hasn't made its 1.0 release yet (myself, I've used subversion since 0.21,

Re: [Python-Dev] Subversion branch merging

Barry> Silly me, the trunk is already available: Barry> https://code.launchpad.net/~vcs-imports/python/trunk Bazaar keeps this in sync with svn.python.org? Skip ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/l

Re: [Python-Dev] Subversion branch merging

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 13, 2007, at 12:24 PM, Facundo Batista wrote: > 2007/7/13, Barry Warsaw <[EMAIL PROTECTED]>: > >> with merges. This means the end of posting patches because instead >> what you would do is post the url to a branch that you published some >> pl

Re: [Python-Dev] Subversion branch merging

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 13, 2007, at 12:54 PM, Martin v. Löwis wrote: >> Sure, you visually compare with diffs, but you apply those changes >> with >> merges. This means the end of posting patches because instead >> what you >> would do is post the url to a branc

Re: [Python-Dev] Subversion branch merging

> Sure, you visually compare with diffs, but you apply those changes with > merges. This means the end of posting patches because instead what you > would do is post the url to a branch that you published some place. But how do you publish stuff? Do you need to run your own web server on your dia

Re: [Python-Dev] Subversion branch merging

2007/7/13, Barry Warsaw <[EMAIL PROTECTED]>: > with merges. This means the end of posting patches because instead > what you would do is post the url to a branch that you published some > place. It means that branch can be kept up-to-date as its parent > branch changes, so a new feature candidat

Re: [Python-Dev] Subversion branch merging

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 13, 2007, at 11:39 AM, [EMAIL PROTECTED] wrote: > Barry> diffs are so 20th century. :) > > How do you compare two versions of something without some sort of > diff? Well okay, you caught me being flippant. :) Sure, you visually compare

Re: [Python-Dev] Subversion branch merging

Barry> diffs are so 20th century. :) How do you compare two versions of something without some sort of diff? Skip ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.o

Re: [Python-Dev] Subversion branch merging

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 13, 2007, at 11:25 AM, Barry Warsaw wrote: > I'll see if I can set up some public bzr mirrors of our svn > repository for people to try it out. Or you could just use the bzr- > svn plugin to get a local repository. Silly me, the trunk is alre

Re: [Python-Dev] Subversion branch merging

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 12, 2007, at 5:54 PM, Brett Cannon wrote: > I do know, though, that Thomas kept talking about moving us over to > Bazaar (or some distributed VCS) and instead of having a ton of svn > branches we have distributed VCS branch for each feature in

Re: [Python-Dev] Subversion branch merging

Dave Harrison wrote: [...] > I can't speak to how easily any of these cross over to the windows > platform, although none of them seem to be overly windows friendly > (YMMV). But I presume this would be one of the key problems facing a > distributed versioning system by the python community. > We

Re: [Python-Dev] Subversion branch merging

Dave Harrison writes: > > Unfortunately, rebasing doesn't seem to be stable yet. > > Not to diverge py-dev too far into the depths of DRCS usage, but are > you doing anything particularly complex ? As of git 1.5.0.something, "git rebase --onto NEWBASE UPSTREAM" just ignored the --onto flag A

Re: [Python-Dev] Subversion branch merging

> You mean using svnmerge? If so, see the dev FAQ: > http://www.python.org/dev/faq/#how-do-i-merge-branches . If you are > after something else then I don't know. =) I think that's what I'm looking for. Thanks, Martin ___ Python-Dev mailing list Pyth

Re: [Python-Dev] Subversion branch merging

>> 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

Dave Harrison writes: > While I can't claim to have spent alot of time with DARCS, my > experience was that it took a fair whack of unintuitive pain to work > out how to extract a patch that I could send upstream to be submitted > to a project. This doesn't seem to be a common issue with Darc

Re: [Python-Dev] Subversion branch merging

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

Re: [Python-Dev] Subversion branch merging

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 that documented somewhere?

[Python-Dev] Subversion branch merging

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 that documented somewhere? Regards, Martin ___ P