Re: SCMS question

From: Markus Schiltknecht <markus(at)bluegap(dot)ch>
To: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
Cc: Alvaro Herrera <alvherre(at)commandprompt(dot)com>, Bruce Momjian <bruce(at)momjian(dot)us>, Gregory Stark <stark(at)enterprisedb(dot)com>, Warren Turkal <wt(at)penguintechs(dot)org>, pgsql-hackers(at)postgresql(dot)org
Subject: Re: SCMS question
Date: 2007-02-26 10:07:01
Message-ID: 45E2B145.1060506@bluegap.ch
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

Hi,

Tom Lane wrote:
> Yah know, the one bit of these pitches that always sounds like pure
> snake oil is the claim that they offer some kind of mechanical solution
> to merge conflicts. AFAICS that has nothing to do with the SCMS in use
> and everything to do with whether your "diff" command is AI-complete.

You should have said "merge" command. Every tried that? Or kdiff3? Try
it, you will be surprised!

Regards

Markus

In response to

Responses

Browse pgsql-hackers by date

  From Date Subject
Next Message Markus Schiltknecht 2007-02-26 10:15:43 Re: [Monotone-devel] Re: SCMS question
Previous Message Markus Schiltknecht 2007-02-26 09:59:32 Re: SCMS question