[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [RFC] 'base' is what in --accept=base?

From: Bert Huijben <bert_at_vmoo.com>
Date: Fri, 10 Sep 2010 09:48:53 +0200

> -----Original Message-----
> From: Paul Burba [mailto:ptburba_at_gmail.com]
> Sent: donderdag 9 september 2010 18:56
> To: Subversion Development
> Subject: [RFC] 'base' is what in --accept=base?
>
> What do we expect 'svn merge --accept=base' to do when encountering
> text conflicts?

(Guessing: )I think this was invented with the update/switch scenario, where you have a BASE version specifying the BASE version before the update started. (The real BASE version (in wc-db) is already bumped to the theirs version at that point.)

In that case it makes sense to call it base (vs mine vs theirs) or maybe older, but svn_client_*merge* uses the libsvn_wc merge code in a different way.

        Bert
Received on 2010-09-10 09:50:16 CEST

This is an archived mail posted to the Subversion Dev mailing list.