<div dir="ltr"><div dir="ltr">In case you missed it, now there is `git llvm revert` : <a href="http://lists.llvm.org/pipermail/llvm-dev/2019-March/131395.html">http://lists.llvm.org/pipermail/llvm-dev/2019-March/131395.html</a></div><div dir="ltr"><br></div><div dir="ltr">-- </div><div>Mehdi</div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Mar 26, 2019 at 11:14 AM Don Hinton via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div><div dir="auto">Yes, thanks Paul. Out of the 9 or 10 I’ve used, git’s definitely the best.</div></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Mar 26, 2019 at 3:38 AM Xing GUO <<a href="mailto:higuoxing@gmail.com" target="_blank">higuoxing@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div dir="auto"><div>Hi, Paul and Don<div dir="auto"><br></div><div dir="auto"><div dir="auto">Thanks a lot, I haven't change my version control tool from svn to git. I would like to have a try. Thanks a lot!</div><div dir="auto"><br></div><div dir="auto">Regards,</div><div dir="auto">Xing</div></div></div></div><div dir="auto"><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr"> <<a href="mailto:paul.robinson@sony.com" rel="noreferrer" target="_blank">paul.robinson@sony.com</a>> 於 2019年3月26日 週二 下午6:33 寫道：<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">
<div lang="EN-US">
<div class="gmail-m_-4630648110831217860m_-238689530302793429m_2186564012196668863m_-5492084433519188964WordSection1">
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">The "Revert [tag] message" is the default message generated by the 'git revert' command. Of course you would have to be using a git clone of LLVM instead of
an SVN checkout in order to run 'git revert'. This command is the equivalent of 'svn merge –r' run from the top-level directory. I believe svn commands will operate only on the directories below the current working directory, so I speculate that you ran
the svn command from the lib subdirectory instead of from the top level, and thus missed the tests that were part of your original commit.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">--paulr<u></u><u></u></span></p>
<p class="MsoNormal"><a name="m_-4630648110831217860_m_-238689530302793429_m_2186564012196668863_m_-5492084433519188964__MailEndCompose" rel="noreferrer noreferrer"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></a></p>
<div style="border-style:none none none solid;border-left-width:1.5pt;border-left-color:blue;padding:0in 0in 0in 4pt">
<div>
<div style="border-style:solid none none;border-top-width:1pt;border-top-color:rgb(181,196,223);padding:3pt 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10pt;font-family:Tahoma,sans-serif">From:</span></b><span style="font-size:10pt;font-family:Tahoma,sans-serif"> llvm-dev [mailto:<a href="mailto:llvm-dev-bounces@lists.llvm.org" rel="noreferrer noreferrer" target="_blank">llvm-dev-bounces@lists.llvm.org</a>]
<b>On Behalf Of </b>Don Hinton via llvm-dev<br>
<b>Sent:</b> Tuesday, March 26, 2019 4:57 AM<br>
<b>To:</b> Xing GUO<br>
<b>Cc:</b> LLVM Development List<br>
<b>Subject:</b> Re: [llvm-dev] How to revert a change properly<u></u><u></u></span></p>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal">Hi Xing:<u></u><u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">There's too much activity to automatically revert anything, so you need to commit a new change that effectively reverts the original patch -- keeping in mind that someone else might have changed some of the same files, and/or lines, in
the interim. Here's how I do it.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">Update your local master, and extract the change using svn diff or git diff to a patch file. Then use patch to apply it locally, using the '-R' flag for reverse, and fix any merge conflicts. If your tests run clean, update your source
one last time just in case, then commit with a new message indicating that you reverted it with a note on why, etc...<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">hth...<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">don<u></u><u></u></p>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<div>
<p class="MsoNormal">On Tue, Mar 26, 2019 at 12:08 AM Xing GUO via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" rel="noreferrer noreferrer" target="_blank">llvm-dev@lists.llvm.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-style:none none none solid;border-left-width:1pt;border-left-color:rgb(204,204,204);padding:0in 0in 0in 6pt;margin-left:4.8pt;margin-right:0in">
<div>
<div>
<p class="MsoNormal">Hi folks,<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">Several days ago, I made a bad change in llvm, and I reverted it using following command<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">```<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">$ <span style="font-family:Arial,sans-serif;color:rgb(106,106,106)">svn</span><span style="font-family:Arial,sans-serif;color:rgb(84,84,84)"> merge -r <bad change revision>:<previous revision></span><u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">```<u></u><u></u></p>
</div>
<p class="MsoNormal">However, this command seemed not working properly. I would like to know, what's the right way to revert a bad change. I notice that there are some reverting change with proper message, e.g. "Revert: [some tag] commit message". Shall I type
this message manually? Or is there some useful tool that I could use?<u></u><u></u></p>
<div>
<p class="MsoNormal"><br clear="all">
<u></u><u></u></p>
<div>
<div>
<div>
<div>
<div>
<div>
<div>
<div>
<p class="MsoNormal">Best Regards,<u></u><u></u></p>
<div>
<p class="MsoNormal">Xing<u></u><u></u></p>
</div>
<div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<p class="MsoNormal">_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" rel="noreferrer noreferrer" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><u></u><u></u></p>
</blockquote>
</div>
</div>
</div>
</div>
</blockquote></div>
</div></div>
</blockquote></div></div>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote></div>