=== df is now known as 6JTAACUN7
=== ph is now known as Guest50827
=== gonyere_ is now known as gonyere
=== Ecchymosis_ is now known as Ecchymosis
[06:50] <darkxst> Noskcaj, it would have been better if you didnt squash all the patches in u-s-d/g-s-d
[06:51] <darkxst> err u-s-d and u-c-c
[06:51] <Noskcaj> ?
[06:52] <darkxst> i.e. for u-s-d in bug https://bugs.launchpad.net/ubuntu/+source/unity/+bug/1228765
[06:52] <ubot5> Ubuntu bug 1228765 in unity-control-center (Ubuntu) "[FFe] Implement DisplayConfig dbus interface and transition to gnome-desktop 3.10" [Low,In progress]
[06:52] <darkxst> you squash ~12 git commits into a single commit for u-s-d
[06:52] <Noskcaj> oh, sorry
[06:53] <darkxst> can you re-do those two
[06:54] <darkxst> g-s-d and g-c-c will also need a rebase, but that can wait until approved
[06:55] <darkxst> actually may just go straight to 3.10 for those, given its so late
[07:00] <darkxst> use 'bzr git-apply <patch>
[07:03] <Noskcaj> ok
[07:03] <darkxst> thanks
[07:04] <Noskcaj> Should i wait for the FFe to be approved, or has it already been?
[07:05] <darkxst> they will probably want that as part of review
[07:05] <Noskcaj> ok
[07:05] <darkxst> hopefully we be approved early this week
[07:28] <Noskcaj> darkxst, bzr: ERROR: unknown command "git-apply"
[07:34] <darkxst> its a plugin, you need to install it
[07:34] <darkxst> 'bzr-git'
[07:48] <Noskcaj> that fixes it. Now i'm getting rejects though
[07:49] <darkxst> they should apply cleanly, if you do it in the right order?
[07:51] <Noskcaj> The orderin the changelog?
[07:52] <darkxst> Noskcaj, use the order in debian/patches/series
[07:52] <Noskcaj> k
[07:52] <darkxst> Noskcaj, in fact you could just script it, make a series.copy with only the new patches
[07:53] <Noskcaj> sounds like too much effort, it's working now, so i'll do it manually
[07:53] <darkxst> for x in `cat series.copy`;do bzr git-apply $x; done
[07:53] <darkxst> should work
[07:55] <Noskcaj> oh great. Now bzr has went and broken
[07:55] <darkxst> bzr or your internet?
=== swiss_ is now known as swiss
[07:57] <Noskcaj> darkxst, bzr
[07:57] <Noskcaj> bug 1292795
[07:57] <ubot5> bug 1292795 in bzr (Ubuntu) "bzr crashed with KeyError in __getitem__(): 'from'" [Undecided,New] https://launchpad.net/bugs/1292795
[07:58] <Noskcaj> does git-apply need a git header? I think that's the issue, since it's fix-cursor-gnomedesktop-api.patch
[08:03] <Noskcaj> settings daemon is done, i'll do control-center tomorrow
[08:04] <darkxst> possibly
=== makije^ is now known as makije
=== makije is now known as makije^
=== njalk_ is now known as njalk
=== makije^ is now known as makije
=== makije is now known as makije^
=== ph_afk is now known as ph
=== ph is now known as Guest87981
=== makije^ is now known as makije
=== makije is now known as makije^