Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
timotheecour opened this issue Jan 20, 2018 · 3 comments
Labels

Comments

@timotheecour
Copy link

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

@CyberShadow
Copy link
Owner

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
Copy link
Owner

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
Copy link
Owner

I assume this is resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants