Re: [OT] VCS tools (was "Development tools and practices for Pythonistas")

Date	2011-04-27 14:07 -0500
From	Tim Chase <python.list@tim.thechases.com>
Subject	Re: [OT] VCS tools (was "Development tools and practices for Pythonistas")
References	<58a6bb1b-a98e-4c4a-86ea-09e040cb2d21@r35g2000prj.googlegroups.com> <mailman.869.1303848895.9059.python-list@python.org> <877hagoa0u.fsf@benfinney.id.au> <4DB7E0D0.2090006@sequans.com>
Newsgroups	comp.lang.python
Message-ID	<mailman.902.1303931267.9059.python-list@python.org> (permalink)

Show all headers | View raw

On 04/27/2011 04:24 AM, Jean-Michel Pichavant wrote:
> Ben Finney wrote:
>> Mercurial – are the ones to choose from. Anoyone
>> recommending a VCS tool that has poor merging support (such
>> as Subversion or, heaven help us, CVS) is doing the newcomer
>> a disservice.
>
> True enough. But the modern crop of first-tier VCSen – Bazaar,
> Git, For a single user, there would be no merge issue. And svn
> is very simple to use.

There have been plenty of times I've needed to merge in SVN as a 
solo developer.  Usually I'll branch off maint. branches and spin 
out feature branches.  For the maint. branches, I want to apply 
hot-fixes to the branch and then merge those hot-fixes into the 
dev mainline.  For the feature branches, I want to be able to 
flip between mainline development and feature development without 
one interfering with the other, but then easily pull changes from 
one to the other.

And it's always been a pain.  While I understand more recent SVN 
releases should auto-mark things in a way that merging is less 
painful, I find that it doesn't come remotely close to the ease 
with which I can merge in other systems.

-tkc

Back to comp.lang.python | Previous | Next — Previous in thread | Next in thread | Find similar

Thread

Development tools and practices for Pythonistas snorble <snorble@hotmail.com> - 2011-04-26 07:39 -0700
  Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-04-26 09:00 -0700
  Re: Development tools and practices for Pythonistas "Martin P. Hellwig" <martin.hellwig@gmail.com> - 2011-04-26 17:02 +0000
  Re: Development tools and practices for Pythonistas Thomas Rachel <nutznetz-0c1b6768-bfa9-48d5-a470-7603bd3aa915@spamschutz.glglgl.de> - 2011-04-26 19:59 +0200
    Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-04-27 04:42 +1000
      Re: Development tools and practices for Pythonistas Thomas Rachel <nutznetz-0c1b6768-bfa9-48d5-a470-7603bd3aa915@spamschutz.glglgl.de> - 2011-04-27 00:32 +0200
    Re: [OT] Comparing VCS tools (was ""Development tools and practices for Pythonistas") Tim Chase <python.list@tim.thechases.com> - 2011-04-26 20:44 -0500
      Re: [OT] Comparing VCS tools Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 12:45 +1000
        Re: [OT] Comparing VCS tools Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 16:51 +1000
        Re: [OT] Comparing VCS tools Tim Chase <python.list@tim.thechases.com> - 2011-04-27 14:13 -0500
      Re: Comparing VCS tools (was ""Development tools and practices for Pythonistas") rusi <rustompmody@gmail.com> - 2011-04-26 19:50 -0700
        Re: Comparing VCS tools (was ""Development tools and practices for Pythonistas") alex23 <wuwei23@gmail.com> - 2011-04-26 22:37 -0700
      Re: [OT] Comparing VCS tools (was ""Development tools and practices  for Pythonistas") Kevin Walzer <kw@codebykevin.com> - 2011-04-29 09:26 -0400
        Re: [OT] Comparing VCS tools (was ""Development tools and practices for Pythonistas") Daniel Kluev <dan.kluev@gmail.com> - 2011-04-30 05:08 +1100
  Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-26 20:04 +0200
  Re: Development tools and practices for Pythonistas CM <cmpython@gmail.com> - 2011-04-26 11:29 -0700
    Re: Development tools and practices for Pythonistas CM <cmpython@gmail.com> - 2011-04-26 11:31 -0700
      Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-04-27 04:50 +1000
  Re: Development tools and practices for Pythonistas Chris Angelico <rosuav@gmail.com> - 2011-04-27 06:14 +1000
    Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 09:41 +1000
      Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-04-27 10:44 +1000
      Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-27 11:24 +0200
        Re: Development tools and practices for Pythonistas Anssi Saari <as@sci.fi> - 2011-04-27 15:13 +0300
          Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-27 14:24 +0200
            Re: Development tools and practices for Pythonistas Hans Georg Schaathun <hg@schaathun.net> - 2011-04-30 08:37 +0100
              Re: Development tools and practices for Pythonistas Martin Schöön <martin.schoon@gmail.com> - 2011-04-30 09:15 +0000
                Re: [OT] VCS for non-text (was Development tools and practices for Pythonistas) Tim Chase <python.list@tim.thechases.com> - 2011-04-30 09:18 -0500
                Re: [OT] VCS for non-text (was Development tools and practices for Pythonistas) Martin Schöön <martin.schoon@gmail.com> - 2011-05-01 19:53 +0000
            Re: Development tools and practices for Pythonistas Hans Georg Schaathun <hg@schaathun.net> - 2011-04-29 19:35 +0100
              Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-30 09:17 +1000
                Re: Development tools and practices for Pythonistas CM <cmpython@gmail.com> - 2011-04-29 20:21 -0700
                Re: Development tools and practices for Pythonistas Roy Smith <roy@panix.com> - 2011-04-29 23:54 -0400
                Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-05-01 10:36 +1000
                Re: Development tools and practices for Pythonistas Shawn Milochik <shawn@milochik.com> - 2011-04-30 20:47 -0400
                Re: Development tools and practices for Pythonistas Dietmar Schwertberger <news@schwertberger.de> - 2011-05-01 18:11 +0200
                Re: Development tools and practices for Pythonistas Jason Earl <jearl@notengoamigos.org> - 2011-05-01 14:51 -0600
                Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-05-02 07:49 +1000
                Re: Development tools and practices for Pythonistas Paul Rubin <no.email@nospam.invalid> - 2011-05-01 19:37 -0700
                Re: Development tools and practices for Pythonistas David Boddie <david@boddie.org.uk> - 2011-05-02 01:33 +0200
                Re: Development tools and practices for Pythonistas Dietmar Schwertberger <news@schwertberger.de> - 2011-05-02 19:40 +0200
                Re: Development tools and practices for Pythonistas Shawn Milochik <shawn@milochik.com> - 2011-04-29 23:49 -0400
                Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-01 20:06 -0700
                Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-05-02 13:22 +1000
                Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-01 20:45 -0700
                Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-05-02 17:08 +1000
                Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-02 00:19 -0700
                Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-05-02 17:48 +1000
                Re: Development tools and practices for Pythonistas jacek2v <jacek2v@gmail.com> - 2011-05-02 02:09 -0700
                Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-05-02 20:38 +1000
                Re: Development tools and practices for Pythonistas jacek2v <jacek2v@gmail.com> - 2011-05-03 11:31 -0700
                Re: Development tools and practices for Pythonistas Anssi Saari <as@sci.fi> - 2011-05-03 21:19 +0300
                Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-03 11:50 -0700
                Re: Development tools and practices for Pythonistas Anssi Saari <as@sci.fi> - 2011-05-04 21:06 +0300
        Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 22:14 +1000
      Re: Development tools and practices for Pythonistas Chris Angelico <rosuav@gmail.com> - 2011-04-27 19:33 +1000
      Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-27 13:17 +0200
        Re: Development tools and practices for Pythonistas Thomas Rachel <nutznetz-0c1b6768-bfa9-48d5-a470-7603bd3aa915@spamschutz.glglgl.de> - 2011-04-27 20:08 +0200
          Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-28 09:44 +1000
      Re: [OT] VCS tools (was "Development tools and practices for Pythonistas") Tim Chase <python.list@tim.thechases.com> - 2011-04-27 14:07 -0500
        Re: [OT] VCS tools (was "Development tools and practices for Pythonistas") Martin Schöön <martin.schoon@gmail.com> - 2011-04-28 20:48 +0000
          Re: [OT] VCS tools Ben Finney <ben+python@benfinney.id.au> - 2011-04-29 07:50 +1000
            Re: [OT] VCS tools Tim Chase <python.list@tim.thechases.com> - 2011-04-28 18:09 -0500
            Re: [OT] VCS tools Daniel Kluev <dan.kluev@gmail.com> - 2011-04-29 11:37 +1100
            Re: [OT] From svn to something else? (was: VCS tools) Hans Georg Schaathun <georg@schaathun.net> - 2011-04-29 11:07 +0100
              Re: [OT] From svn to something else? Tim Chase <python.list@tim.thechases.com> - 2011-04-29 06:50 -0500
                Re: [OT] From svn to something else? Hans Georg Schaathun <hg@schaathun.net> - 2011-04-29 18:01 +0100
                Re: [OT] From svn to something else? Tim Chase <python.list@tim.thechases.com> - 2011-04-29 13:23 -0500
              Re: [OT] From svn to something else? Ben Finney <ben+python@benfinney.id.au> - 2011-04-29 22:53 +1000
                Re: [OT] From svn to something else? "D'Arcy J.M. Cain" <darcy@druid.net> - 2011-04-29 09:26 -0400
            Re: [OT] VCS tools Martin Schöön <martin.schoon@gmail.com> - 2011-04-29 18:46 +0000
  Re: Development tools and practices for Pythonistas Dan Stromberg <drsalists@gmail.com> - 2011-04-26 14:00 -0700
  recommended Emacs mode (was Re: Development tools and practices for Pythonistas) Gour-Gadadhara Dasa <gour@atmarama.net> - 2011-04-27 08:39 +0200
    Re: recommended Emacs mode (was Re: Development tools and practices for Pythonistas) rusi <rustompmody@gmail.com> - 2011-04-27 00:51 -0700
      Re: recommended Emacs mode Gour-Gadadhara Dasa <gour@atmarama.net> - 2011-04-27 10:10 +0200

csiph-web