Magic Lantern Forum

Developing Magic Lantern => General Development => Topic started by: dfort on August 04, 2015, 09:44:37 AM

Title: Need help cleaning up a Bitbucket mess
Post by: dfort on August 04, 2015, 09:44:37 AM
There is a strange branch in bitbucket with my name on it:

daniel_fort/added-sounddevshutdownin-1435698205057

I must have made a mistake on a June 30 pull request and just noticed it. This wasn't a problem with the two previous pull requests I made following these instructions (http://www.magiclantern.fm/forum/index.php?topic=7940.msg70958#msg70958).

There are some instructions about deleting branches with a "git push" command but I have never used git before and don't want mess things up even worse.

What should I do?  :'(
Title: Re: Need help cleaning up a Bitbucket mess
Post by: dmilligan on August 04, 2015, 01:27:10 PM
"git push" probably won't have much effect on a mercurial (hg) repository :P

You didn't make a mistake and nothing is messed up, this branch probably just got created automatically by bitbucket so it could do it's pull request and merging. It's not hurting anything, you can just ignore the fact that it exists. If you want to, you can delete the branch using the bitbucket interface: http://www.magiclantern.fm/forum/index.php?topic=9524.0
Title: Re: Need help cleaning up a Bitbucket mess
Post by: dfort on August 05, 2015, 05:10:54 PM
Thanks, guess I shouldn't worry but I tried your tip:

Quote#5: Close unused branches
This wasn't exactly intuitive to figure out how to do in bitbucket so I'm simply sharing how you do it, so that you can keep your 'tree pruned' from branches you're no longer using:
Click on 'branches' in bitbucket.
For the branch you want to close hover your mouse near the right edge of the list, you'll see three dots.
Click and you get a pull down with an option to close the branch.

It looks like I don't have permission to do that:

(https://farm1.staticflickr.com/419/20129888478_cfe5a71561_b.jpg)
Title: Re: Need help cleaning up a Bitbucket mess
Post by: dmilligan on August 05, 2015, 05:18:08 PM
Is the branch in your repo or the main ML repo? If it's in the main repo, don't worry about it, it's the maintainer's responsibility to cleanup automatic branches like this, not yours.
Title: Re: Need help cleaning up a Bitbucket mess
Post by: dfort on August 05, 2015, 10:20:01 PM
Yep, it is in the main branch so I'm off the hook  8)
Title: Re: Need help cleaning up a Bitbucket mess
Post by: Licaon_Kter on August 09, 2015, 01:06:32 PM
Heh, my modes fix is also there :P
Title: Re: Need help cleaning up a Bitbucket mess
Post by: dmilligan on August 09, 2015, 03:47:17 PM
I fixed it ;)