comp.lang.ada
 help / color / mirror / Atom feed
From: Brian May <bam@snoopy.apana.org.au>
Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server
Date: Thu, 28 Sep 2006 14:27:32 +1000
Date: 2006-09-28T14:27:32+10:00	[thread overview]
Message-ID: <sa47izoty2z.fsf@margay.local> (raw)
In-Reply-To: 451a8d49$1@news.post.ch

>>>>> "Martin" == Martin Krischik <krischik@users.sourceforge.net> writes:

    Martin> That's exactly was I was always looking for. I just hate
    Martin> how most vcs force me to mess up my perfectly good code by
    Martin> forcing me to merge when I am not yet ready for
    Martin> merge. Worse: I won't have a backup copy of the pre-merge
    Martin> code.

Same here - occasionally at my previous job (they used subversion) it
was almost like a race to commit my changes first so I wouldn't have
to deal with the conflicts. Didn't always work as planned though, as
often the second person would accidently revert my changes by doing an
update operation with the file still open in the editor. "Why did you
revert my changes? The bug I fixed came back again. Did I break
something?" "I didn't revert your change!" "Yes you did, in revision
XYZ!"

Creating a fork, and then dealing with the merge operation, later,
when ready, would appear to be a much better strategy.
-- 
Brian May <bam@snoopy.apana.org.au>



      reply	other threads:[~2006-09-28  4:27 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-25 20:18 ANNOUNCE: Debian build scripts on a public Monotone server Ludovic Brenta
2006-09-26  2:21 ` Steve Whalen
2006-09-26  5:13   ` Ludovic Brenta
2006-09-26  7:32     ` Ludovic Brenta
2006-09-26  8:13     ` Ludovic Brenta
2006-09-27  7:17       ` Alex R. Mosteo
2006-09-27  9:31   ` Samuel Tardieu
2006-09-27 13:29     ` Ludovic Brenta
2006-09-27 14:23       ` Samuel Tardieu
2006-09-27 14:56         ` Ludovic Brenta
2006-09-28  4:40         ` Brian May
2006-09-28  8:25           ` Samuel Tardieu
2006-09-26  5:04 ` Brian May
2006-09-26  5:13   ` Ludovic Brenta
2006-09-28  4:14   ` Brian May
2006-09-26  8:38 ` Georg Bauhaus
2006-09-26  9:32   ` Ludovic Brenta
2006-09-26 10:43     ` Georg Bauhaus
2006-09-26 10:52       ` Ludovic Brenta
2006-09-28  8:52       ` njs
2006-09-29  5:12         ` Brian May
2006-09-30  0:03           ` njs
2006-09-30 10:08             ` Martin Krischik
2006-09-30 11:45             ` Samuel Tardieu
2006-10-04 20:42               ` njs
2006-10-06  6:12                 ` Brian May
2006-10-06  8:24                   ` Ludovic Brenta
2006-10-08  7:34                     ` Brian May
2006-10-08  9:29                       ` njs
2006-10-08  9:24                     ` njs
2006-10-08  8:49                   ` njs
2006-09-26 17:33 ` Pascal Obry
2006-09-26 19:23   ` Ludovic Brenta
2006-09-26 19:57     ` Pascal Obry
2006-09-27  5:03   ` Brian May
2006-09-27 13:25     ` Ludovic Brenta
2006-09-27 14:40       ` Martin Krischik
2006-09-28  4:27         ` Brian May [this message]
replies disabled

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox