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: a07f3367d7,6458d1ee91b224ec X-Google-Attributes: gida07f3367d7,public,usenet X-Google-NewGroupId: yes X-Google-Language: ENGLISH,ASCII-7-bit X-Received: by 10.180.102.69 with SMTP id fm5mr2394612wib.0.1361849357620; Mon, 25 Feb 2013 19:29:17 -0800 (PST) Path: bp2ni59445wib.1!nntp.google.com!feeder1.cambriumusenet.nl!82.197.223.103.MISMATCH!feeder3.cambriumusenet.nl!feed.tweaknews.nl!193.141.40.65.MISMATCH!npeer.de.kpn-eurorings.net!npeer-ng0.de.kpn-eurorings.net!border2.nntp.ams2.giganews.com!border4.nntp.ams.giganews.com!border2.nntp.ams.giganews.com!nntp.giganews.com!news.teledata-fn.de!weretis.net!feeder1.news.weretis.net!usenet.pasdenom.info!dedibox.gegeweb.org!gegeweb.eu!nntpfeed.proxad.net!proxad.net!feeder2-2.proxad.net!newsfeed.arcor.de!newsspool2.arcor-online.net!news.arcor.de.POSTED!not-for-mail Date: Wed, 20 Feb 2013 00:20:28 +0100 From: Georg Bauhaus User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 Newsgroups: comp.lang.ada Subject: Re: Version control and multiple implementation variants (Was: chopping Ada source that have preprocessor symbols in them) References: <5111a9d5$0$6567$9b4e6d93@newsspool3.arcor-online.net><85txpnm1vp.fsf@stephe-leake.org><5114fb61$0$6561$9b4e6d93@newsspool4.arcor-online.net><85ehgqkxnf.fsf@stephe-leake.org><51168e7e$0$6566$9b4e6d93@newsspool3.arcor-online.net><85r4khdfm3.fsf@stephe-leake.org><511e17c3$0$9520$9b4e6d93@newsspool1.arcor-online.net><511E64AB.8030805@obry.net> <871ucffhtu.fsf@adaheads.sparre-andersen.dk> <87liakk4aa.fsf_-_@adaheads.sparre-andersen.dk> In-Reply-To: Message-ID: <512408bc$0$9508$9b4e6d93@newsspool1.arcor-online.net> Organization: Arcor NNTP-Posting-Date: 20 Feb 2013 00:20:28 CET NNTP-Posting-Host: 84620795.newsspool1.arcor-online.net X-Trace: DXC=:b5YZQO\9^;TQL:hoD@>T?ic==]BZ:af>4Fo<]lROoR1nkgeX?EC@@0JkkRih[6ejV87gfhe=4 On 19.02.13 22:07, Randy Brukardt wrote: > My level of sharing is much more fine-grained than yours. I'm thinking about > any individual line of text that's shared, A similar situation that requires very small changes only is when a software component needs to be compiled for both Ada 95 and Ada 2005. It works in many cases, but there are differences between the versions of the language that won't allow the same source to be accepted by both compilers. When that is the case, there will be small differences, and they will stay even when the language version does not affect most of the "algorithmic lines" of the source text. I imagine that using version control and branches, I will be injecting lots of submit and merge steps between the usual edit and compile steps. Sounds suboptimal.