Board index FlightGear Development

What to do in Git for Merge Request ?  Topic is solved

FlightGear is opensource, so you can be the developer. In the need for help on anything? We are here to help you.
Forum rules
Core development is discussed on the official FlightGear-Devel development mailing list.

Bugs can be reported in the bug tracker.

What to do in Git for Merge Request ?

Postby mhab » Sat Nov 30, 2013 11:37 am

Hello

I fixed issue 1215 and made it up to a successful push back to my fgdata clone on gitorious ...
I can see all my commits.

Problem:
When I try to request a merge in the Browser window I can enter comment and description.
I can select Target repository, Target branch, Source branch but I cannot select a range of commits.
There is only the button "Create merge request" and nothing happens when I click on it.

What's missing ? Is it a Git problem ?
I really did everything as described on the Wiki.

I use Firefox, and NoScript plugin, but no restrictions on git site are active ?

It is a hard way before contribution happens for the first time :(

Mike-DE
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10

Re: What to do in Git for Merge Request ?

Postby sa7k » Sat Nov 30, 2013 5:54 pm

Probably some temporary error in gitorious but you could check all steps at the wiki and see if you missed something.
http://wiki.flightgear.org/FlightGear_Git:_data_developers
sa7k
 
Posts: 382
Joined: Fri Mar 16, 2012 2:24 pm
Location: SA7K
Callsign: LV-EPM
IRC name: sa7k
Version: git
OS: debian

Re: What to do in Git for Merge Request ?

Postby mhab » Sat Nov 30, 2013 6:06 pm

Thanks

That's exactly the page I followed and the missing part is right at the very end where I don't get the page as shown in the screenshot http://wiki.flightgear.org/File:Create_merge_request_at_Gitorious.png

The missing part is the table where the commits are listed and can be checked.

However I can see my commits on the git page of my repository.
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10

Re: What to do in Git for Merge Request ?

Postby Gijs » Sat Nov 30, 2013 6:41 pm

Hm, not sure why/if this would matter, but could the issue be your clone lagging seven months behind? Why are you pushing to such an old clone?
Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9385
Joined: Tue Jul 03, 2007 2:55 pm
Location: Amsterdam/Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: What to do in Git for Merge Request ?

Postby mhab » Sat Nov 30, 2013 7:18 pm

Thanks Gijs for helping.

Maybe my fault. I talked to colleagues which use git professionally and was told, I don't need to clone again ... as this should be an advantage of git. But they use git-hub and not gitorious ...

If not so, then do I have to clone every second day or every second week ?

I did "git clone" from my local machine just 2 days ago and thought this way I have the most recent state.

Believe me I really try do the right thing, I read all kinds of doku several times and I use version control systems for 20 years +, ... and maybe that's my problem.
Flightgear is not an easy piece to dig into but this git thing for me is almost the overkill.
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10

Re: What to do in Git for Merge Request ?

Postby mhab » Sat Nov 30, 2013 7:43 pm

meanwhile I checked my local clone files from End of Nov.13 (2 days ago) against FG 2.12 state of mid Sept. 13
No change was lost, and so I think I was not working on an outdated state.
The damage should only be theoretical, if any ... ;-)

Hoping for a good end, and B.T.W. git on windows doesn't work for me with SSH and HTTPS at all. I can only access and write with the git url.
Thanks for all the enormous effort in keeping these things together ...

Mike-DE
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10

Re: What to do in Git for Merge Request ?

Postby Gijs » Sat Nov 30, 2013 8:53 pm

Your local clone may be up to date, but your clone on Gitorious was not. My advice: delete your clone on Gitorious, create a new clone and push to that from your local tree. That should push your commits on top of the latest commits in fgdata.
Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9385
Joined: Tue Jul 03, 2007 2:55 pm
Location: Amsterdam/Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: What to do in Git for Merge Request ?

Postby mhab » Sun Dec 01, 2013 3:41 am

Hello

So now one more against git, grrrrrrrr

- removed old clone on gitorious
- created new clone on gitorious
- tried git pull from local machine, didn't work because of too many diffs
- removed old local repository
- made new complete local clone
- redid my changes
- made new push
- 4 new commits are there in gitorious

and
merge request still not possible

tried it in Firefox and Chrome

sorry but all I have left for git are four letter words which shall not be used here.
A complete waste of time
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10

Re: What to do in Git for Merge Request ?

Postby Gijs » Sun Dec 01, 2013 11:22 am

It's at least up to date now. Could you give me acces (username "gijs") to your clone to see if I get the same issue? If so, I'll just pull from your clone and push the commits directly (without merge request).
Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9385
Joined: Tue Jul 03, 2007 2:55 pm
Location: Amsterdam/Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: What to do in Git for Merge Request ?

Postby mhab » Mon Dec 02, 2013 1:21 pm

I added "gijs" as collaborator with full rights. Hope this helps.

Thanks for taking care even to this detailed level.

Mike-DE
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10

Re: What to do in Git for Merge Request ?

Postby Gijs » Mon Dec 02, 2013 1:46 pm

Same issue :-( I can however select a range of commits when I set "target branch" to something other than "master". But that's obviously not what we want; it should work for master. We're possibly running into https://issues.gitorious.org/issues/338

I will process your commits this afternoon, please remind me if it's not done by tomorrow.
Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9385
Joined: Tue Jul 03, 2007 2:55 pm
Location: Amsterdam/Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: What to do in Git for Merge Request ?  

Postby Gijs » Mon Dec 02, 2013 8:34 pm

Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9385
Joined: Tue Jul 03, 2007 2:55 pm
Location: Amsterdam/Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: What to do in Git for Merge Request ?

Postby mhab » Mon Dec 02, 2013 9:29 pm

Wow, thanks a lot Gijs

I made a comment about this in Bug tracker issue #1215 but seems I am not in a position to change bug state there ...

Mike-DE
mhab
 
Posts: 410
Joined: Thu Apr 18, 2013 10:59 pm
Callsign: D-MIKE
Version: 2019.1.1
OS: Win10


Return to Development

Who is online

Users browsing this forum: No registered users and 1 guest