Re: [Zope-dev] Hg mirror available
On 6/19/09 6:28 AM, Balazs Ree wrote: - afaik svn does _not_ show this, what's more, it does not store any metadata about the merges or changesets involved. When doing the merge you really select a diff of the branch by specifying which changesets you want to include back in trunk. This is why it's so important with svn to note in the commit message, which revisions from which branch you merged. Otherwise you would not know at all what has been merged. Subversion 1.5 and later do store that data in a svn:mergeinfo property. Wichert. -- Wichert Akkerman wich...@wiggy.net It is simple to make things. http://www.wiggy.net/ It is hard to make things simple. ___ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
[Zope-dev] Zope Tests: 8 OK
Summary of messages to the zope-tests list. Period Thu Jun 18 12:00:00 2009 UTC to Fri Jun 19 12:00:00 2009 UTC. There were 8 messages: 8 from Zope Tests. Tests passed OK --- Subject: OK : Zope-2.10 Python-2.4.6 : Linux From: Zope Tests Date: Thu Jun 18 20:56:18 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011979.html Subject: OK : Zope-2.11 Python-2.4.6 : Linux From: Zope Tests Date: Thu Jun 18 20:58:20 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011980.html Subject: OK : Zope-trunk Python-2.4.6 : Linux From: Zope Tests Date: Thu Jun 18 21:00:21 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011981.html Subject: OK : Zope-trunk Python-2.5.4 : Linux From: Zope Tests Date: Thu Jun 18 21:02:21 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011982.html Subject: OK : Zope-trunk Python-2.6.1 : Linux From: Zope Tests Date: Thu Jun 18 21:04:22 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011983.html Subject: OK : Zope-trunk-alltests Python-2.4.6 : Linux From: Zope Tests Date: Thu Jun 18 21:06:24 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011984.html Subject: OK : Zope-trunk-alltests Python-2.5.4 : Linux From: Zope Tests Date: Thu Jun 18 21:08:24 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011985.html Subject: OK : Zope-trunk-alltests Python-2.6.1 : Linux From: Zope Tests Date: Thu Jun 18 21:10:25 EDT 2009 URL: http://mail.zope.org/pipermail/zope-tests/2009-June/011986.html ___ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
[Zope-dev] [action required] Zope Contributor Agreement change
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi all, This is a last reminder for those current contributors to the Zope software repositories on svn.zope.org who have not sent in the new contributor agreement as outlined below. Please do so before June 26, otherwise your write access will be removed. Thanks! jens --- You may be aware that the copyright for software stored in the software repositories on svn.zope.org has recently been assigned to the Zope Foundation, from the earlier copyright holder Zope Corporation. The old contributor agreements expressly assigned a joint copyright to Zope Corporation for any software checked into svn.zope.org repositories. With the Zope Foundation taking over these copyrights, the agreement with the contributors needs to change so that the Zope Foundation is the joint copyright holder for all new code coming into the repositories. For you as a contributor this means you need to submit a new contributor agreement[1] if you want to stay on as an active contributor to Zope and/or the other software hosted in the repositories on svn.zope.org. Here's how: - download the new agreement[1] - fill in the new agreement, and since you are a current contributor it is OK to enter Jim Fulton (j...@zope.com) as the required reference committer - sign and date the agreement - either scan the agreement and email it to foundation-i...@zope.org, or fax it to the Zope Foundation fax number +1 (703) 842-8076 To ensure a timely copyright transition we ask you to submit the new contributor agreement no later than June 17, 2009. The Zope Foundation board will try to contact any contributor who has not replied at that point between June 18 and June 26, and on June 26 checkin access will be removed for those who have not sent in the new agreement. Thanks again for your support! Jens Vagelpohl Secretary, Zope Foundation Board of Directors [1] http://foundation.zope.org/agreements/ZopeFoundation_Committer_Agreement -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.8 (Darwin) iEYEARECAAYFAko7g9IACgkQRAx5nvEhZLJvhACglvhy4BaNiopzRl1Wmd2QKvqs lNQAn0TFevKwT6kBSJ6m+ZJgDACvRSqF =pvqS -END PGP SIGNATURE- ___ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
Re: [Zope-dev] Hg mirror available
Hi Wolfgang, On Fri, Jun 19, 2009 at 2:43 AM, Wolfgang Schnerringw...@gocept.com wrote: Hi there, * Sidnei da Silva sidnei.da.si...@gmail.com [2009-06-18 14:28]: I'm asking because I noticed that basically all SVN-DVCS conversion tools (hg convert, git-svn, bzr svn-import, svn2bzr, svn-fast-export.py, svn-all-fast-export.cpp) do not convert the history properly, more precisely, history that happened on branches is lost: Here's some context about this from one of the Bazaar developers, John Arbash Meinel. Hopefully that will solve some of your questions? Thanks for relaying! I'm not really sure what he means by edit and then merge without a commit inbetween. So I'm assuming there is one. Sorry for being overly brief in my description; please find below a sample shell script to set up a Subversion repository with a project containing a trunk and a branch. To reproduce the problem I'm concerned about, do this: $ create-repos.sh repos $ svn log repos/project/trunk/feature.txt r9 | wosc | 2009-06-18 17:11:46 +0200 (Thu, 18 Jun 2009) | 1 line merged feature1 r8 | wosc | 2009-06-18 17:11:43 +0200 (Thu, 18 Jun 2009) | 1 line implemented feature1 As you can see, Subversion reports the history of the file that happenened on the branch (in r8). Can you show us your 'svn --version'? I suspect what you're seeing is a result of svn 1.5 merge tracking. After converting the repository, however... $ bzr init-repo repos-bzr $ cd repos-bzr $ bzr svn-import file://$PWD/../repos $ bzr log repos/project/trunk/feature.txt revno: 3 svn revno: 9 (on /project/trunk) committer: wosc timestamp: Thu 2009-06-18 14:11:46 + message: merged feature1 ... this history is lost. Not only does it not appear in the log output, also when looking at bzr visualize it seems like that branch never existed at all in bzr. (I'm new to bzr, am I missing something here?) Like John said, it *should* be possible to bring that information over if the svn repository is in 1.5 format and contains informations about merge, but at the moment that (apparently) hasn't been implemented. -- Sidnei da Silva Canonical Ltd. Landscape · Changing the way you manage your systems http://landscape.canonical.com ___ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
Re: [Zope-dev] [action required] Zope Contributor Agreement change
On 6/19/09 2:25 PM, Jens Vagelpohl wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi all, This is a last reminder for those current contributors to the Zope software repositories on svn.zope.org who have not sent in the new contributor agreement as outlined below. Please do so before June 26, otherwise your write access will be removed. Are you sending receipt confirmations? I submitted an updated agreement a while ago, but never got a response, so I am unsure at the moment if it was received or if I still need to take further action. Wichert. ___ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
Re: [Zope-dev] [action required] Zope Contributor Agreement change
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jun 19, 2009, at 19:01 , Wichert Akkerman wrote: Are you sending receipt confirmations? I submitted an updated agreement a while ago, but never got a response, so I am unsure at the moment if it was received or if I still need to take further action. Hi Wichert, No, confirmations are not sent. If you have not received a personal email directly addressed to you before the mailing list emails, which are designed as a fall-through to those who do not read these personal emails, then you are fine. jens -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.8 (Darwin) iEYEARECAAYFAko7xRoACgkQRAx5nvEhZLI51wCfb4u4PiGzpfUE7QtF74wV+M66 SpYAoI+6JhlQUKB0YufC8mhFxM7b+lkn =AU+c -END PGP SIGNATURE- ___ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
