Strategies for push/merge problem?
Douglas Philips
dgou at mac.com
Tue Jul 15 19:19:51 CDT 2008
On or about 2008 Jul 15, at 3:31 PM, Roman Kennke indited:
> development repository. It happened to me lately 'Hey, WTF is this? I
> need to do 6 steps to get a oneliner pushed (push (fail), pull,
> update,
> merge, commit, push (again)), and this is the ideal case when I don't
> have the workspace cluttered with uncommitted changes (another bad
> behaviour encouraged by CVS...)'.
Isn't it just two steps:
hg fetch
hg push
I mean we are talking lazy developers living la vida CVS, right?
> But it turns out that when using it in a classical centralized way,
> people get
> punished badly.
I wouldn't go that far. I have noticed in my group that Hg definitely
pushes the-"Fear Merges! Fear Merges!"-hot-button they got from CVS.
It is definitely a social issue, and I'm currently using some of the
pain involved in "keep the same workflow, but use Hg instead of CVS"
as a lever to start thinking about the workflow in different ways. :)
--Doug
P.S. When it comes to the social aspects of moving from CVS to a
Distributed Version Control System, I like this quote from Darren
Moffat(1):
"You aren't losing functionality, you are losing the illusion that you
ever had anything reliable."
(1) - Referring specifically to keyword substitution, but it seems to
apply to a lot of CVSisms...
via: http://opensolaris.org/jive/message.jspa?messageID=255017
More information about the Mercurial
mailing list