Date: Sun, 15 Jan 2012 14:42:04 -0800 From: Doug Barton <dougb@FreeBSD.org> To: Andriy Gapon <avg@FreeBSD.org> Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r230174 - stable/8/sys/kern Message-ID: <4F13563C.8060108@FreeBSD.org> In-Reply-To: <4F1354FA.1070300@FreeBSD.org> References: <201201152218.q0FMIsMS003166@svn.freebsd.org> <4F1354FA.1070300@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F13563C.8060108>