Date: Wed, 7 Mar 2012 06:17:02 +0300 From: Sergey Kandaurov <pluknet@freebsd.org> To: Jaakko Heinonen <jh@freebsd.org> Cc: Remko Lodder <remko@elvandar.org>, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, Remko Lodder <remko@freebsd.org> Subject: Re: svn commit: r232606 - stable/8 Message-ID: <CAE-mSOLnEpu5=rrs2t=zwv3i0kj574GG5PtG0uQcMUKpz5U5Cw@mail.gmail.com> In-Reply-To: <20120306190748.GB51782@jh> References: <201203061410.q26EAvav043586@svn.freebsd.org> <CAE-mSO%2BXB5dZFgAj64gg%2Bq2RCzZOwtJwjNo5mzJ3K4OKCkhc5A@mail.gmail.com> <56c9876464416184673b0ea9b41f025e@evilcoder.org> <20120306190748.GB51782@jh>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6 March 2012 23:07, Jaakko Heinonen <jh@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 > =A0 Reverse-merged /head:r219005 Yep, that is a way I used to reverse-merge things in stable together with mergeinfo. --=20 wbr, pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSOLnEpu5=rrs2t=zwv3i0kj574GG5PtG0uQcMUKpz5U5Cw>