-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
I committed r70197 to trunk a few days ago. Today I copied "svnmerge.py" in my 2.6 branch, and did an "init" and a "merge"... like it is said in the developer FAQ. I got a lot of conflicts and "old patches" merged. Overhelming.
So...
Can anybody please merge r70197 to 2.6 branch?
Can somebody explain how to do a correct svnmerge and, possibly, update http://www.python.org/dev/faq/#how-do-i-merge-between-branches ?
Sorry for this inconvenience. I promise to learn the lessons you teach me.
PS: I know how to merge using pure SVN and Mercurial... O:-)
Jesus Cea Avion _/_/ _/_/_/ _/_/_/ jcea@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ jabber / xmpp:jcea@jabber.org _/_/ _/_/ _/_/_/_/_/ . _/_/ _/_/ _/_/ _/_/ _/_/ "Things are not so easy" _/_/ _/_/ _/_/ _/_/ _/_/ _/_/ "My name is Dump, Core Dump" _/_/_/ _/_/_/ _/_/ _/_/ "El amor es poner tu felicidad en la felicidad de otro" - Leibniz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iQCVAwUBSbaAR5lgi5GaxT1NAQKE1gP9E0b2e8lRwBouayLHuk9cDTrVOJo12Mad mZ/dDAzPo4I6dHXkns4PEt8/m2NhCvOFW0abt51bFLVoKUSomuPyxvT9hie/z2wq Ra/+czIRjdbwFrk6WeZW7kURIgBDA5OG35p/34LsnhVi/+3JNW42uQRRjusRYO3m iUtCCpOdDnw= =UpbJ -----END PGP SIGNATURE-----
I think those instructions are for merging lots of things at once.
What I've used when I'm merging a single revision is this:
greg@pts/6.dealer/9:46AM% svn up ~/sandbox/python/release26-maint At revision 70301. greg@pts/6.dealer/9:47AM% python ../svnmerge.py merge -r70197 property 'svnmerge-integrated' deleted from '.'.
property 'svnmerge-blocked' deleted from '.'.
--- Merging r70197 into '.': U Doc/library/bsddb.rst
property 'svnmerge-integrated' set on '.'
property 'svnmerge-blocked' set on '.'
greg@pts/6.dealer/9:49AM% ls *.txt ~/sandbox/python/release26-maint svnmerge-commit-message.txt
Anyways, I just committed the above merge as r70302.
On Tue, Mar 10, 2009 at 7:59 AM, Jesus Cea <jcea@jcea.es> wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
I committed r70197 to trunk a few days ago. Today I copied "svnmerge.py" in my 2.6 branch, and did an "init" and a "merge"... like it is said in the developer FAQ. I got a lot of conflicts and "old patches" merged. Overhelming.
So...
Can anybody please merge r70197 to 2.6 branch?
Can somebody explain how to do a correct svnmerge and, possibly, update http://www.python.org/dev/faq/#how-do-i-merge-between-branches ?
Sorry for this inconvenience. I promise to learn the lessons you teach me.
PS: I know how to merge using pure SVN and Mercurial... O:-)
Jesus Cea Avion _/_/ _/_/_/ _/_/_/ jcea@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ jabber / xmpp:jcea@jabber.org <xmpp%3Ajcea@jabber.org> _/_/ _/_/ _/_/_/_/_/ . _/_/ _/_/ _/_/ _/_/ _/_/ "Things are not so easy" _/_/ _/_/ _/_/ _/_/ _/_/ _/_/ "My name is Dump, Core Dump" _/_/_/ _/_/_/ _/_/ _/_/ "El amor es poner tu felicidad en la felicidad de otro" - Leibniz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iQCVAwUBSbaAR5lgi5GaxT1NAQKE1gP9E0b2e8lRwBouayLHuk9cDTrVOJo12Mad mZ/dDAzPo4I6dHXkns4PEt8/m2NhCvOFW0abt51bFLVoKUSomuPyxvT9hie/z2wq Ra/+czIRjdbwFrk6WeZW7kURIgBDA5OG35p/34LsnhVi/+3JNW42uQRRjusRYO3m iUtCCpOdDnw= =UpbJ -----END PGP SIGNATURE-----
python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
Gregory P. Smith wrote:
I think those instructions are for merging lots of things at once.
That FAQ question is actually 3 questions in one:
How do I set up merge tracking for a new branch? (A: Use "svnmerge init") Since this has already been done for the maintenance branches, no need for anyone to do it again.
How do I merge all unmerged revisions from the base branch to the current branch? (A: Use "svnmerge merge"). Only a few developers will want to do this.
How do I merge a specific revision (or set of revisions) from the base branch to the current branch? (A: Use "svnmerge merge -r <revision #>"). This is what most developers will use when porting a single change between branches.
Cheers, Nick.
-- Nick Coghlan | ncoghlan@gmail.com | Brisbane, Australia
Gregory P. Smith wrote:
What I've used when I'm merging a single revision is this:
<details deleted>
I think the more pressing question that needs documenting is: "Given that there are 4 active branches, in which order do I check things in and merge them?"
Martin gave an answer to this on December 22, and I refer to it often. It's:
--------8<---------------- Instead, you should commit it into trunk, and then run svnmerge.py three times, namely:
in a release26-maint checkout, run
svnmerge.py -r<yourrev> svn commit -F svnmerge-commit-something-press-tab
in a py3k checkout, run
svnmerge.py -r<yourrev> svn commit -F svnmerge-commit-something-press-tab
in a release30-maint check, then run
svnmerge.py -r<revfrom3k> svn revert . svn commit -F svnmerge-commit-something-press-tab
--------8<----------------
I think it was later corrected that the "svn revert" should be "svn resolved", if it's needed at all. But I'm not sure about that. As I recall, I've never needed that step.
Eric.
svnmerge.py -r<revfrom3k> svn revert . svn commit -F svnmerge-commit-something-press-tab
--------8<----------------
I think it was later corrected that the "svn revert" should be "svn resolved", if it's needed at all. But I'm not sure about that. As I recall, I've never needed that step.
It should be needed every time you merge into the 3.0 branch, and yes, it should be "resolved", not "revert".
Regards, Martin
On Tue, Mar 10, 2009 at 16:13, "Martin v. Löwis" <martin@v.loewis.de> wrote:
svnmerge.py -r<revfrom3k> svn revert . svn commit -F svnmerge-commit-something-press-tab
--------8<----------------
I think it was later corrected that the "svn revert" should be "svn resolved", if it's needed at all. But I'm not sure about that. As I recall, I've never needed that step.
It should be needed every time you merge into the 3.0 branch, and yes, it should be "resolved", not "revert".
I will add it to the FAQ right now.
-Brett
participants (6)
-
"Martin v. Löwis"
-
Brett Cannon
-
Eric Smith
-
Gregory P. Smith
-
Jesus Cea
-
Nick Coghlan