svn commit: r230174 - stable/8/sys/kern
jilles at stack.nl
Sun Jan 15 23:07:29 UTC 2012
On Sun, Jan 15, 2012 at 02:42:04PM -0800, Doug Barton wrote:
> On 01/15/2012 14:36, Andriy Gapon wrote:
> > What happened. There was a merge conflict. I initially chose the
> > postpone option. Then edited the file to get a correct merge. Then
> > ran svn resolve. It complained that it needed --accept option, so I
> > used --accept=base. I didn't do another svn diff after that before
> > committing the change and that was my mistake. Apparently svn
> > resolve --accept=base changed the file.
> I'm pretty sure that after you've edited the file you want mine-full
> there, but the options to --accept confuse me as well (FWIW).
I think 'mine-full' means you want the version that was in the stable
branch before the MFC.
As shown in 'svn help resolved', the equivalent of 'svn resolved' is
'svn resolve --accept working'. I still prefer 'svn resolved' though as
it is less typing :)
I have also found the questions asked by 'svn merge' to be usable in
More information about the svn-src-stable-8