Re: [Python-Dev] If I check something in ...

2008-12-22 Thread skip
Martin> Instead, you should commit it into trunk, and then run svnmerge.py three Martin> times, namely: ... Thanks for that cheat sheet. I never would have figured that out on my own. Well, at least not in a timely fashion. Skip ___ Pytho

Re: [Python-Dev] If I check something in ...

2008-12-22 Thread skip
Benjamin> If you check it into the trunk, it will find it's way into Benjamin> 2.6, 3.1, and 3.0. Outstanding! Thx, Skip ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://

Re: [Python-Dev] If I check something in ...

2008-12-22 Thread Benjamin Peterson
On Mon, Dec 22, 2008 at 4:27 PM, "Martin v. Löwis" wrote: > You shouldn't check it in four times. But (IMO) you also shouldn't wait > for somebody else to merge it (I know some people disagree with that > recommendation). I don't completely disagree. Certainly, if you want to make sure your chang

Re: [Python-Dev] If I check something in ...

2008-12-22 Thread Martin v. Löwis
> I would like to add it to the 2.6 and 3.0 maintenance branch and the 2.x > trunk and the py3k branch. What is the preferred way to do that? Do I > really have to do the same task four times or can I check it in once (or > twice) secure in the belief that someone will come along and do a monster

Re: [Python-Dev] If I check something in ...

2008-12-22 Thread Benjamin Peterson
On Mon, Dec 22, 2008 at 4:02 PM, wrote: > > I have this trivial little test case for test_file.py: > >+def testReadWhenWriting(self): >+self.assertRaises(IOError, self.f.read) > > I would like to add it to the 2.6 and 3.0 maintenance branch and the 2.x > trunk and the py3k bra

[Python-Dev] If I check something in ...

2008-12-22 Thread skip
I have this trivial little test case for test_file.py: +def testReadWhenWriting(self): +self.assertRaises(IOError, self.f.read) I would like to add it to the 2.6 and 3.0 maintenance branch and the 2.x trunk and the py3k branch. What is the preferred way to do that? Do I rea