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
--
http://mail.python.org/mailman/listinfo/python-list
