search

linuxmint / live-installer

A live installer for the Debian edition
57 stars 65 forks source link

Some fixes and features #33

Closed kernc closed 10 years ago

kernc commented 10 years ago

This is all single branch, yet the cumulative gravity of changesets kindly suggests you examine each commit separately.

The "thing" was tested and it works. To mitigate dh_install failing (which prevents the package build), create a dummy cp po/live-installer.pot po/dummy.po until any real translations are available.

Note, the commit order seems to be a bit off due to my rebasing back and forth. a6491b9 should come before both of the larger commits (93f40af, e0361c9).

Open to suggestions. :]

monsta commented 10 years ago

This is HUGE. I'm sure @clefebvre will tell you to split this into six separate pull requests.... O_o

kernc commented 10 years ago

:) It's not that huge if you discount the i18n-revamping commit (which creates a lengthy new *.po file for each language and deletes some 5 other files per each language) and look at each commit separately. One can always cherry-pick, but I'm sure all of these are in your eventual interest. :D

kernc commented 10 years ago

Ok, this is not ready yet, there are a few things I forgot, so please don't merge just yet.

I'm still open to more feedback, though. :)

clefebvre commented 10 years ago

Hi Kernc,

Monsta is right. If these commits had their own individual pull requests, I could test them individually and merge them individually. They wouldn't hold each others also...

Some of them I could even merge immediately.

kernc commented 10 years ago

Ok, I understand. But two commits (the "new i18n" and "multi-disk") indeed do rely on "debian bump" as the newly code is Python2.7 (as the "debian bump" commit indicates). So do you suggest I put EVERY each commit in a separate branch, or do I let these two commits share this one common ancestor? (Provided you're OK with bumping Debian and Python version anyway. :stuck_out_tongue: )

monsta commented 10 years ago

Don't worry, we already have Python 2.7 in LMDE, and no trace of 2.6 :)

kernc commented 10 years ago

Sure.

Well, I've done it, more or less. Hope it's fine, seven pull-requests.

Dividing specific features into branches is mighty fine, but with larger overhauling commits (#35 is an example), which tend to touch the same lines as (i.e. have non-empty intersections with) other commits, this results in nasty merge conflicts twice, once on my end when I have to rebase what I naturally developed incrementally, and once when you merge it all together. Which kind of sucks. :smiley: I'll let you know what I mean.