anonym wrote (14 Mar 2012 13:28:07 GMT) : > In conclusion: I want to rebase the branches:
> * persistent-custom (in the tails_live-boot repo) > - this will fix an inconsistency with upstream, which was rebased. > This will be an exception to the normal work flow in which I should > cherry-pick all new commits from upstream once it has been rebased. > * feature/live-boot-3.x (in the amnesia repo) > - the faulty and unused (since this branch was never merged into > anything) live-boot build will be dropped from the history and > replaced with a good build from the above rebased persistent-custom > branch. > After this I'll merge feature/live-boot-3.x into feature/tails-greeter > and then all should be peachy. Looks great, but you could as well delete the feature/live-boot-3.x branch and directly drop the correct live-boot .deb into the feature/tails-greeter one. > It shows that I didn't sleep well tonight; I've also been mixing > words and in general writing like a demented vegetable on #tails all > day. I'm sorry for all the confusion. Take care of yourself! Cheers, -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc | We're dreaming of something else. | Something more clandestine, something happier. _______________________________________________ tails-dev mailing list [email protected] https://mailman.boum.org/listinfo/tails-dev
