search

cancerit / PCAP-core

NGS reference implementations and helper code for mapping (originally part of ICGC-TCGA-PanCancer)
GNU General Public License v2.0
9 stars 9 forks source link

DO NOT MERGE - Hotfix/4.1.4 #17

Closed ghost closed 6 years ago

ghost commented 6 years ago

@keiranmraine . Please review before I finish and release the hotfix.

Checked result with error coming from https://github.com/cancerit/PCAP-core/blob/51792476dab7e1948706465b8fa73954d42de773/c/diff_bams.c#L226

$ install/bin/diff_bams -a test_a.bam -b test_b.bam
Reference sequence count passed
Reference sequence order passed
[ERROR] (./diff_bams.c: main:226 errno: None) Files differ at record 1 (qname) a=HWI-D00430:24:H8E5EADXX:1:1212:7385:86144 b=HWI-D00430:24:H8E5EADXX:1:1212:7528:60881

$ echo $?
1
keiranmraine commented 6 years ago

This looks fine, confused why you need to merge master to bring branches up to date. The branch should started from master if it's a hotfix.

EDIT: Ahh I see the problem. You need to set the target to master when you want review on a hotfix then you won't have that problem.

screen shot 2018-03-10 at 10 09 00
ghost commented 6 years ago

Merged master because when I ran git hf hotfix start it hadn't run hf update. So the new hotfix branch was miles behind.