on 16/01/2012 00:36 Andriy Gapon said the following: > on 16/01/2012 00:18 Andriy Gapon said the following: >> Author: avg >> Date: Sun Jan 15 22:18:54 2012 >> New Revision: 230174 >> URL: http://svn.freebsd.org/changeset/base/230174 >> >> Log: >> MFC r228718: ule: ensure that batch timeshare threads are scheduled >> fairly > > Apologies, this commit is screwed up. > > 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.
A shorter version: I used svn resolve instead of svn resolved and even having to specify the --accept option didn't alert me to my mistake. Sigh. -- Andriy Gapon _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
