dependencies - Issue 29730656: Issue 6476 - Update adblockplusui dependencies to ead38c2013b5

Delta Between Two Patch Sets: dependencies

Issue 29730656: Issue 6476 - Update adblockplusui dependencies to ead38c2013b5 (Closed)

Left Patch Set: Created March 22, 2018, 8:45 p.m.

Right Patch Set: updated git dependency Created March 23, 2018, 3 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/	1 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/

2 _self = buildtools/ensure_dependencies.py	2 _self = buildtools/ensure_dependencies.py

3 buildtools = buildtools hg:c830dfa08e2f git:3a925dd	3 buildtools = buildtools hg:c830dfa08e2f git:3a925dd

4 adblockpluscore = adblockpluscore hg:69a1ff0e91b3 git:a902e17	4 adblockpluscore = adblockpluscore hg:69a1ff0e91b3 git:a902e17

5 adblockplusui = adblockplusui hg:12c59fe0fa0a git:93b2850	5 adblockplusui = adblockplusui hg:ead38c2013b5 git:0290fb1
kzar 2018/03/23 11:04:32 Please instead update the dependency to ead38c2013 Please instead update the dependency to ead38c2013b5 since I will need to make some other changes when updating the dependency on to 12c59fe0fa0a. Also please update the Git revision. saroyanm 2018/03/23 11:26:47 I was thinking to push this -> https://codereview. Show quoted text On 2018/03/23 11:04:32, kzar wrote: > Please instead update the dependency to ead38c2013b5 since I will need to make > some other changes when updating the dependency on to 12c59fe0fa0a. Also please > update the Git revision. I was thinking to push this -> https://codereview.adblockplus.org/29730617/ first before updating. kzar 2018/03/23 11:30:03 I will need to make some further changes to adbloc Show quoted text On 2018/03/23 11:26:47, saroyanm wrote: > On 2018/03/23 11:04:32, kzar wrote: > > Please instead update the dependency to ead38c2013b5 since I will need to make > > some other changes when updating the dependency on to 12c59fe0fa0a. Also > please > > update the Git revision. > > I was thinking to push this -> https://codereview.adblockplus.org/29730617/ > first before updating. I will need to make some further changes to adblockpluschrome when updating the adblockplusui dependency to include 12c59fe0fa0a (see #6511). So I can either also include #6510 at the same time, or we can update the dependency a third time to include that. Either way this review isn't blocked by #6510. saroyanm 2018/03/23 12:03:17 Noted, I've pushed 6510 and did some tests, as it Show quoted text On 2018/03/23 11:30:03, kzar wrote: > On 2018/03/23 11:26:47, saroyanm wrote: > > On 2018/03/23 11:04:32, kzar wrote: > > > Please instead update the dependency to ead38c2013b5 since I will need to > make > > > some other changes when updating the dependency on to 12c59fe0fa0a. Also > > please > > > update the Git revision. > > > > I was thinking to push this -> https://codereview.adblockplus.org/29730617/ > > first before updating. > > I will need to make some further changes to adblockpluschrome when updating the > adblockplusui dependency to include 12c59fe0fa0a (see #6511). So I can either > also include #6510 at the same time, or we can update the dependency a third > time to include that. Either way this review isn't blocked by #6510. Noted, I've pushed 6510 and did some tests, as it was dependent on current changes. kzar 2018/03/23 12:10:38 Please could you update the dependency to ead38c20 Show quoted text On 2018/03/23 12:03:17, saroyanm wrote: > Noted, I've pushed 6510 and did some tests, as it was dependent > on current changes. Please could you update the dependency to ead38c2013b5 instead? I need to make some other changes at the same time as updating the dependency to 12c59fe0fa0a (#6511) and I can include your 12c59fe0fa0a change (#6510) at the same time / we can update the dependency again afterwards. saroyanm 2018/03/23 12:15:49 Sorry I think I had missunderstood you, done. Show quoted text On 2018/03/23 12:10:38, kzar wrote: > On 2018/03/23 12:03:17, saroyanm wrote: > > Noted, I've pushed 6510 and did some tests, as it was dependent > > on current changes. > > Please could you update the dependency to ead38c2013b5 instead? I need to make > some other changes at the same time as updating the dependency to 12c59fe0fa0a > (#6511) and I can include your 12c59fe0fa0a change (#6510) at the same time / we > can update the dependency again afterwards. Sorry I think I had missunderstood you, done. kzar 2018/03/23 13:09:39 That's OK, but please could you update the Git rev Show quoted text On 2018/03/23 12:15:49, saroyanm wrote: > On 2018/03/23 12:10:38, kzar wrote: > > On 2018/03/23 12:03:17, saroyanm wrote: > > > Noted, I've pushed 6510 and did some tests, as it was dependent > > > on current changes. > > > > Please could you update the dependency to ead38c2013b5 instead? I need to make > > some other changes at the same time as updating the dependency to 12c59fe0fa0a > > (#6511) and I can include your 12c59fe0fa0a change (#6510) at the same time / > we > > can update the dependency again afterwards. > > Sorry I think I had missunderstood you, done. That's OK, but please could you update the Git revision as well? saroyanm 2018/03/23 14:38:39 It should be updated -> https://codereview.adblock Show quoted text On 2018/03/23 13:09:39, kzar wrote: > On 2018/03/23 12:15:49, saroyanm wrote: > > On 2018/03/23 12:10:38, kzar wrote: > > > On 2018/03/23 12:03:17, saroyanm wrote: > > > > Noted, I've pushed 6510 and did some tests, as it was dependent > > > > on current changes. > > > > > > Please could you update the dependency to ead38c2013b5 instead? I need to > make > > > some other changes at the same time as updating the dependency to > 12c59fe0fa0a > > > (#6511) and I can include your 12c59fe0fa0a change (#6510) at the same time > / > > we > > > can update the dependency again afterwards. > > > > Sorry I think I had missunderstood you, done. > > That's OK, but please could you update the Git revision as well? It should be updated -> https://codereview.adblockplus.org/29730656/diff/29731606/dependencies kzar 2018/03/23 14:50:23 Well so far the the adblockplusui dependency is be Show quoted text On 2018/03/23 14:38:39, saroyanm wrote: > On 2018/03/23 13:09:39, kzar wrote: > > That's OK, but please could you update the Git revision as well? > > It should be updated -> > https://codereview.adblockplus.org/29730656/diff/29731606/dependencies Well so far the the adblockplusui dependency is being changed to "hg:ead38c2013b5 git:1669870", the Mercurial revision is what I asked for so I'm happy with that, but the Git revision is not right. It should rather be 0290fb1. saroyanm 2018/03/23 15:02:10 OOps, sorry for that I used the revision for your Show quoted text On 2018/03/23 14:50:23, kzar wrote: > On 2018/03/23 14:38:39, saroyanm wrote: > > On 2018/03/23 13:09:39, kzar wrote: > > > That's OK, but please could you update the Git revision as well? > > > > It should be updated -> > > https://codereview.adblockplus.org/29730656/diff/29731606/dependencies > > Well so far the the adblockplusui dependency is being changed to > "hg:ead38c2013b5 git:1669870", the Mercurial revision is what I asked for so I'm > happy with that, but the Git revision is not right. It should rather be 0290fb1. OOps, sorry for that I used the revision for your last change.. Now should be the right one
LEFT	RIGHT