[RFC] 'base' is what in --accept=base?
From: Paul Burba <ptburba_at_gmail.com>
Date: Thu, 9 Sep 2010 12:56:28 -0400
What do we expect 'svn merge --accept=base' to do when encountering
While checking up on an old open issue
(Example done with trunk_at_995460)
# Here is our merge target:
>svn cat A_COPY\D\H\psi
# Here is the conflicting change we are going to merge:
>svn cat A\D\H\psi_at_2
>svn cat A\D\H\psi_at_3
# Do the merge, requesting conflicts be resolved to base:
>svn merge ^^/A A_COPY -c3 --accept base
# The resolution chooses the "base" of the left side of the merge.
>svn diff A_COPY\D\H\psi
Is this correct? Or should A_COPY/D/H/psi be at its *own* base,
svn merge --accept base has *never* worked in 1.5 or 1.6 (it segfaults
This is an archived mail posted to the Subversion Dev mailing list.