From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.4 X-Google-Thread: 103376,a326ac15995ef20e X-Google-Attributes: gid103376,public X-Google-Language: ENGLISH,ASCII-7-bit From: Brian May Newsgroups: comp.lang.ada Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server References: <871wpzd7js.fsf@ludovic-brenta.org> <4519647E.3020308@obry.net> <87zmclzbjf.fsf@ludovic-brenta.org> <451a8d49$1@news.post.ch> Date: Thu, 28 Sep 2006 14:27:32 +1000 Message-ID: User-Agent: Gnus/5.110006 (No Gnus v0.6) XEmacs/21.4.19 (linux) Cancel-Lock: sha1:DsNXuJfKa3FyFpgW9KPJuNFZuqE= MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii NNTP-Posting-Host: snoopy.microcomaustralia.com.au X-Trace: quokka.wn.com.au 1159417654 202.173.153.89 (28 Sep 2006 12:27:34 +0800) X-Complaints-To: abuse@westnet.com.au Path: g2news2.google.com!news4.google.com!news.glorb.com!quokka.wn.com.au!not-for-mail Xref: g2news2.google.com comp.lang.ada:6789 Date: 2006-09-28T14:27:32+10:00 List-Id: >>>>> "Martin" == Martin Krischik 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