/srv/irclogs.ubuntu.com/2012/08/27/#bzr.txt

mardyhi! 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:49
mardyit's a package maintained in merge mode07:50
mardy(shotwell)07:50
=== Guest92976 is now known as dpb___
tbfhttp://doc.bazaar.canonical.com/latest/en/user-guide/organizing_your_workspace.html - is there also an easy in-tree workflow14:09
tbfi really don't like to reconfigure my build environment every time i start a new feature branch, or i switch between them14:10
mgedminyou're looking for colocated branches14:11
mgedminthere's some kind of support for them in latest bzr releases; before that there was a plugin14:11
tbfmgedmin: http://doc.bazaar.canonical.com/developers/colocated-branches.html? this looks good. now let's figure out if bzr 2.5.1 already has them14:13
=== zyga is now known as zyga-afk
jelmertbf: 2.5.1 only has some of the API work14:36
=== lifeless_ is now known as lifeless
jkcajHello!22:36
jkcajI'm new to IRC.  Can anybody see this?22:37
jelmerjkcaj: hi22:38
jkcajHi.  How am I doing?22:38
jkcajBetter yet, how are you doing?22:39
jelmerjkcaj: :-) Alright22:39
jkcajI'm looking for help with Bazaar version control.  Can you help?22:39
jkcajI think I'm in the wrong place.  I'm going to sign off and go someplace else22:45
=== jelmer_ is now known as jelmer
=== jelmer is now known as Guest90165
=== Guest90165 is now known as jelmer

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!