Submitter | phabricator |
---|---|
Date | March 6, 2020, 10:20 a.m. |
Message ID | <differential-rev-PHID-DREV-lyca5qognuxc73bgk7zt-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/45538/ |
State | Superseded |
Headers | show |
Comments
martinvonz added inline comments. INLINE COMMENTS > test-copies-chain-merge.t:42 > > -Have a branching with nothing on one side > +And Having another branch with renames on the other side > nit: lower-case "having" :P REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8247/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8247 To: marmoute, #hg-reviewers Cc: martinvonz, mercurial-devel
marmoute added inline comments. INLINE COMMENTS > martinvonz wrote in test-copies-chain-merge.t:42 > nit: lower-case "having" :P can you fix this inflight? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8247/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8247 To: marmoute, #hg-reviewers Cc: martinvonz, mercurial-devel
martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in test-copies-chain-merge.t:42 > can you fix this inflight? Unless I have other comments on the series, sure. I'm not done reviewing yet. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8247/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8247 To: marmoute, #hg-reviewers Cc: martinvonz, mercurial-devel
marmoute added inline comments. INLINE COMMENTS > martinvonz wrote in test-copies-chain-merge.t:42 > Unless I have other comments on the series, sure. I'm not done reviewing yet. This is the first patch of the series, so I don't expect anything to block it ;-) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8247/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8247 To: marmoute, #hg-reviewers Cc: martinvonz, mercurial-devel
martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in test-copies-chain-merge.t:42 > This is the first patch of the series, so I don't expect anything to block it ;-) Sure, but if I have comments on other patches in the series, it seems fair that you address this one as well instead of leaving that to the reviewer. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8247/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8247 To: marmoute, #hg-reviewers Cc: martinvonz, mercurial-devel
marmoute added a comment. marmoute marked 2 inline comments as done. done locally. pull update the diff when done REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8247/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8247 To: marmoute, #hg-reviewers Cc: martinvonz, mercurial-devel
Patch
diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t --- a/tests/test-copies-chain-merge.t +++ b/tests/test-copies-chain-merge.t @@ -39,7 +39,7 @@ o 0 i-0 initial commit: a b] -Have a branching with nothing on one side +And Having another branch with renames on the other side $ hg mv d e $ hg ci -Am 'a-1: d -move-> e' @@ -57,7 +57,7 @@ o 0 i-0 initial commit: a b] -And Having another branch with renames on the other side +Have a branching with nothing on one side $ hg up 'desc("i-2")' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved