Details
-
Bug
-
Resolution: Timed out
-
Low
-
2.6.0
-
Severity 3 - Minor
-
Description
felog is emitting the parents for a file in the right order:
$ hg felog -pm c590d Commit Id: c590dc97a88e5f4c204d0bdcf52ee8573d75983d Rev Id: 24448 Branch: 2.5 Author: Adam Ahmed <aahmed@atlassian.com> Date: 1304043223.0-36000 Tags: Log Msg: NONE: merge Parents: 24447:bdc9e3b84e341b7118e7582a50a6209eebc511b5 24328:346b803d9ec468532b03d88637905253cf4dd802 File: src/content/static/2static/style/style.css Rev: 24448:c590dc97a88e5f4c204d0bdcf52ee8573d75983d Status: Modified Size: 77724 Flags: Binary: False Parent0: 24447:bdc9e3b84e341b7118e7582a50a6209eebc511b5 src/content/static/2static/style/style.css Parent1: 24316:071dc3e1e2e6c12889f7778e864aadd558c314a8 src/content/static/2static/style/style.css diff --git a/src/content/static/2static/style/style.css b/src/content/static/2static/style/style.css --- a/src/content/static/2static/style/style.css +++ b/src/content/static/2static/style/style.css @@ -1863,1 +1863,1 @@ - font-size: 1.1em; + font-size: 1.1em;
But (see screenshot or https://extranet.atlassian.com/crucible/browse/FE-hg/src/content/static/2static/style/style.css?focusedRev=c590dc97a88e5f4c204d0bdcf52ee8573d75983d&fromRev=071dc3e1e2e6c12889f7778e864aadd558c314a8&toRev=c590dc97a88e5f4c204d0bdcf52ee8573d75983d#rc590dc97a88e5f4c204d0bdcf52ee8573d75983d), In FE, they are being picked up in the reverse order.
Thus the LoC says +1-1 but if you click the "Diff" link you go here: https://extranet.atlassian.com/crucible/browse/FE-hg/src/content/static/2static/style/style.css?r2=c590dc97a88e5f4c204d0bdcf52ee8573d75983d&r1=071dc3e1e2e6c12889f7778e864aadd558c314a8 instead of https://extranet.atlassian.com/crucible/browse/FE-hg/src/content/static/2static/style/style.css?r1=bdc9e3b84e341b7118e7582a50a6209eebc511b5&r2=c590dc97a88e5f4c204d0bdcf52ee8573d75983d&u=20
Attachments
Issue Links
- blocks
-
FE-5026 dddd
- Closed