svn commit: r232606 - stable/8
pluknet at freebsd.org
Wed Mar 7 03:17:05 UTC 2012
On 6 March 2012 23:07, Jaakko Heinonen <jh at freebsd.org> wrote:
> On 2012-03-06, Remko Lodder wrote:
>> On 06.03.2012 15:29, Sergey Kandaurov wrote:
>> > Eh, it seems you merged r238821 to stable/8, and that's wrong.
> Actually mergeinfo says r219005.
>> > Changes to top-level files should be merged directly to that file
>> > rather than to the root of the whole tree (see rule 12).
>> Point received and taken. I'll look after that the next time. How do I
>> clean this up on the root?
> In the stable/8 root directory:
> $ svn merge -c -232606 .
> $ svn revert ObsoleteFiles.inc
> $ svn diff
> Property changes on: .
> Modified: svn:mergeinfo
> Reverse-merged /head:r219005
Yep, that is a way I used to reverse-merge things in stable together
More information about the svn-src-stable-8