svn commit: r230653 - in stable/9: lib/libopie share/examples/diskless share/examples/ppp share/examples/printing tools/tools/nanobsd/pcengines/Files/root usr.sbin/pkg_install/add

[Doug Barton]

On 02/16/2012 01:25, Jaakko Heinonen wrote:
> On 2012-02-15, Eitan Adler wrote:
>> On Wed, Feb 15, 2012 at 11:09 AM, Jaakko Heinonen <jh at freebsd.org> wrote:
>>> On 2012-02-15, Eitan Adler wrote:
>>>> On Wed, Feb 15, 2012 at 10:50 AM, Jaakko Heinonen <jh at freebsd.org> wrote:
>>>>
>>>>> I think this commit incorrectly placed mergeinfo to stable/9/share/.
>>>>
>>>> I used the following command:
>>>>
>>>>  2811  svn merge -c229831 $FSVN/head/share share
>>>>
>>>> Should I have committed somewhere else?
>>>> http://wiki.freebsd.org/SubversionPrimer/Merging is not particularly
>>>> helpful for share/ changes.
>>>
>>> Looking at previous merges I would have merged it to share/examples.
>>
>> I updated the wiki (see #11) and thanks for the help.
> 
> I think that the mergeinfo from stable/9/share could be just deleted.
> Unless I am mistaken there hasn't been merges that would place mergeinfo
> only to stable/9/share after r230653.
> 
> Could someone confirm that this is the right thing to do?

The mergeinfo should be placed in the correct location first, but then
it can be removed from share/, yes.



-- 

	It's always a long day; 86400 doesn't fit into a short.

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