search

CyberShadow / Digger

A tool to build D and bisect old D versions
Other
57 stars 9 forks source link

dub run digger -- build "master + tools#271" does not apply https://github.com/dlang/tools/pull/271 #63

Closed timotheecour closed 6 years ago

timotheecour commented 6 years ago

dub run digger -- build "master + tools#271" doesn't seen to be applying https://github.com/dlang/tools/pull/271 (but it does fetch dmd master)

CyberShadow commented 6 years ago

Works for me:

digger: Merging tools commit 671a3bd1119cdb527227028bbf0b9b91b5fddeb5
digger: Cleaning repository tools...
HEAD is now at ed24fb4 Merge pull request #229 from MartinNowak/merge_stable
digger: Don't have commit 024bda4d003f52b9bb5e5501a1485df703b4dcad, updating and retrying...
digger: Updating tools...
Fetching origin
remote: Counting objects: 12, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 12 (delta 5), reused 8 (delta 4), pack-reused 2
Unpacking objects: 100% (12/12), done.
From git://github.com/D-Programming-Language/tools
   ee59ec9..024bda4  master     -> origin/master
   a333dda..cb10403  newCTFE    -> origin/newCTFE
   6a97e2f..47ee907  stable     -> origin/stable
digger: Checking out tools commit 024bda4d003f52b9bb5e5501a1485df703b4dcad...
Previous HEAD position was ed24fb4... Merge pull request #229 from MartinNowak/merge_stable
HEAD is now at 024bda4... Merge pull request #290 from dlang/revert-271-rdmd_dashi
digger: Merging 671a3bd1119cdb527227028bbf0b9b91b5fddeb5 into 024bda4d003f52b9bb5e5501a1485df703b4dcad.
Already up to date.
digger: Merge successful.
CyberShadow commented 6 years ago

That PR was merged and reverted, so merging it again will have no effect because it's already in the git history. What you want is to revert the revert:

digger build "master + -tools#290"
CyberShadow commented 6 years ago

I assume this is resolved.