Magic Lantern Forum

Developing Magic Lantern => General Development => Topic started by: Marsu42 on September 26, 2013, 12:04:14 PM

Title: [DONE] Clean up repo branches?
Post by: Marsu42 on September 26, 2013, 12:04:14 PM
Currently there are 32 branches in the main ml repo - how about deleting the outdated branches?

They are dragged around with every fork which doesn't seem very clean & might create confusion as unified seems to be the only one being worked on... since there are so many ml working forks probably doing in-repo branches except for quick experiments isn't such a good idea at all, but create a full fork even if the person has write access to the main repo?
Title: Re: Clean up repo branches?
Post by: a1ex on September 26, 2013, 12:12:32 PM
+1
Title: Re: Clean up repo branches?
Post by: Marsu42 on September 26, 2013, 12:33:43 PM
Quote from: a1ex on September 26, 2013, 12:12:32 PM
+1

in this case, +1 for you just doing it :-> ... maybe after creating a zip backup of the branches if someone later on complains about something missing.
Title: Re: Clean up repo branches?
Post by: a1ex on September 26, 2013, 12:37:13 PM
First I need to learn how ;)
Title: Re: Clean up repo branches?
Post by: dmilligan on September 26, 2013, 12:48:20 PM
Quote from: Marsu42 on September 26, 2013, 12:33:43 PM
maybe after creating a zip backup of the branches if someone later on complains about something missing.
you don't need to, this is version control, they will always be there even if you delete them, that's the whole point of version control
Title: Re: Clean up repo branches?
Post by: Marsu42 on September 26, 2013, 12:55:07 PM
Quote from: dmilligan on September 26, 2013, 12:48:20 PM
you don't need to, this is version control, they will always be there even if you delete them, that's the whole point of version control

You're saying it's impossible to actually delete a branch on bitbucket, it's only logically removed but the data will remain there just like your embarrassing teen party snaps on facebook?
Title: Re: Clean up repo branches?
Post by: dmilligan on September 26, 2013, 01:00:34 PM
that's version control ;)

everything you do is computed as a change (diff) from the previous version and only the change is stored, hence the name 'changeset' a reposity is simply a huge list of changes, you apply them all and end up with the current version, even deleting is stored as a 'change'. you can always leave out a changeset or stop at an old version

I think something like this should work:

$ hg commit --close-branch -m "closed this branch"

Title: Re: Clean up repo branches?
Post by: Marsu42 on September 26, 2013, 01:05:04 PM
Quote from: dmilligan on September 26, 2013, 01:00:34 PM
you apply them all and end up with the current version, even deleting is stored as a 'change'.

*If* you apply them - is is also true for a branch that went nowhere & wasn't merged with anything?
Title: Re: Clean up repo branches?
Post by: dmilligan on September 26, 2013, 01:31:06 PM
http://hgbook.red-bean.com/read/
Title: Re: Clean up repo branches?
Post by: Marsu42 on September 26, 2013, 01:36:42 PM
Quote from: dmilligan on September 26, 2013, 01:31:06 PM
http://hgbook.red-bean.com/read/

Ok, ok, I get it :-p ... but thanks for teaching me about this!
Title: Re: Clean up repo branches?
Post by: LinuxGadget on September 26, 2013, 09:35:33 PM
Nice, thanks!

Quote from: dmilligan on September 26, 2013, 01:31:06 PM
http://hgbook.red-bean.com/read/