[07:49] <mardy> hi! I'm trying to update the upstream, but one of my debian patches now fails to apply -- I have no idea how to proceed, someone can please give me a hint?
[07:50] <mardy> it's a package maintained in merge mode
[07:50] <mardy> (shotwell)
=== Guest92976 is now known as dpb___
[14:09] <tbf> http://doc.bazaar.canonical.com/latest/en/user-guide/organizing_your_workspace.html - is there also an easy in-tree workflow
[14:10] <tbf> i really don't like to reconfigure my build environment every time i start a new feature branch, or i switch between them
[14:11] <mgedmin> you're looking for colocated branches
[14:11] <mgedmin> there's some kind of support for them in latest bzr releases; before that there was a plugin
[14:13] <tbf> mgedmin: http://doc.bazaar.canonical.com/developers/colocated-branches.html? this looks good. now let's figure out if bzr 2.5.1 already has them
=== zyga is now known as zyga-afk
[14:36] <jelmer> tbf: 2.5.1 only has some of the API work
=== lifeless_ is now known as lifeless
[22:36] <jkcaj> Hello!
[22:37] <jkcaj> I'm new to IRC.  Can anybody see this?
[22:38] <jelmer> jkcaj: hi
[22:38] <jkcaj> Hi.  How am I doing?
[22:39] <jkcaj> Better yet, how are you doing?
[22:39] <jelmer> jkcaj: :-) Alright
[22:39] <jkcaj> I'm looking for help with Bazaar version control.  Can you help?
[22:45] <jkcaj> I think I'm in the wrong place.  I'm going to sign off and go someplace else
=== jelmer_ is now known as jelmer
=== jelmer is now known as Guest90165
=== Guest90165 is now known as jelmer