I'll try that next time. Thanks! -Alex
On Wed, Apr 30, 2014 at 10:39 AM, Manuel Klimek <[email protected]> wrote: > On Wed, Apr 30, 2014 at 7:24 PM, Alex McCarthy <[email protected]> wrote: > >> Good to know. So does your workflow look like this? >> >> 1. Send out a patch: >> $ git checkout master >> $ git fetch && git svn rebase -l # sync >> $ git checkout -b feature-branch >> $ vi foo.c # hack hack hack >> $ git commit -a >> $ arc diff # send a code review >> >> 2. Iterate on review: >> $ vi foo.c # respond to review comments >> $ git commit -a >> $ arc diff # update code review >> >> 3. Submit: >> > I do > $ git checkout master > $ git merge branch --squash > $ git svn dcommit > > >> $ git rebase -i git_commit_id_pulled_from_git_log # squash commits >> $ git svn dcommit >> $ git checkout master >> $ git fetch && git svn rebase -l # sync, confirm changes >> $ git branch -d feature-branch # nuke now unused branch >> # Manually close review in llvm.reviews.org UI >> >> ? >> >> -Alex >> >> >> On Wed, Apr 30, 2014 at 10:17 AM, Manuel Klimek <[email protected]>wrote: >> >>> On Wed, Apr 30, 2014 at 6:03 PM, Alex McCarthy <[email protected]>wrote: >>> >>>> Thanks, I'll do that next time. Should I use that instead of git svn >>>> dcommit to push the change? >>>> >>> >>> I usually just commit with git svn dcommit (I find the commit message >>> from arc commit a bit too wordy for my taste). >>> >>> >>>> -Alex >>>> >>>> >>>> On Wed, Apr 30, 2014 at 7:58 AM, Alexander Kornienko <[email protected] >>>> > wrote: >>>> >>>>> On Wed, Apr 30, 2014 at 4:26 PM, Alex McCarthy <[email protected]>wrote: >>>>> >>>>>> ================ >>>>>> Comment at: test/clang-tidy/temporaries.cpp:3 >>>>>> @@ +2,3 @@ >>>>>> +// FileCheck complains if the input file is empty, so add a dummy >>>>>> line. >>>>>> +// RUN: echo foo >> %t.log >>>>>> +// RUN: FileCheck %s < %t.log >>>>>> ---------------- >>>>>> Alexander Kornienko wrote: >>>>>> > You don't need this now as the correct output is guaranteed to be >>>>>> non-empty. And you can now just pipe clang-tidy output to FileCheck >>>>>> Good catch: fixed in llvm-reviews.chandlerc.com/rL207653 >>>>>> >>>>>> http://reviews.llvm.org/D3556 >>>>>> >>>>>> >>>>> BTW, if you use Phabricator's arc tool, you can also use "arc commit", >>>>> which automatically closes the Differential revision in Phab. >>>>> >>>> >>>> >>> >> >
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
