svn commit: r230174 - stable/8/sys/kern

[Doug Barton]

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).


hth,

Doug

-- 

	You can observe a lot just by watching.	-- Yogi Berra

	Breadth of IT experience, and depth of knowledge in the DNS.
	Yours for the right price.  :)  http://SupersetSolutions.com/