-----BEGIN PGP SIGNED MESSAGE-----
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.
Can anybody please merge r70197 to 2.6 branch?
Can somebody explain how to do a correct svnmerge and, possibly, update
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(a)jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/
jabber / xmpp:email@example.com _/_/ _/_/ _/_/_/_/_/
. _/_/ _/_/ _/_/ _/_/ _/_/
"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
-----END PGP SIGNATURE-----
Btw, one of my concerns is that a move away from Svn breaks the process for
people who pull sources from Svn to build their own Pythons. I know a few
teams that do that, and switching to another system isn't just an apt-get
away for them. Do we have enough log info to be able to determine how common
it is that people pull down source kits using Svn?
On Feb 28, 2009 1:11 AM, <jnoller(a)gmail.com> wrote:
The survey isn't biased. You have a value "the same /worse than the status
quo" - wherein the status quo is subversion. If you hate DVCes, you mark it
as "same/worse than the status quo" and we move on.
No one is suggesting we accept *less* functionality than subversion: in fact
we're looking at these for *more* functionality.
On Feb 27, 2009 7:04pm, Fredrik Lundh <fredrik(a)pythonware.com> wrote: > > No
need for a long answe...
> On Feb 27, 2009 9:24 PM, "Brett Cannon" brett(a)python.org> wrote: > > I had
a long reply all writt...
To see if people actually want to switch off of svn to a DVCS, I have put
together a survey for everyone to state for each DVCS if they think it is
better, worse, or equal to svn (and an option to not say anything if you
have no experience with the DVCS):
The survey is not anonymous so that I can make sure no one games this; I can
check for duplicate usernames in the answers. But I will not give out any
information beyond aggregate data, so identifiable information stops at me.
I plan to keep this open for a week before I begin to seriously look at the