[04:18] <Noldorin> what's the difference between bzr update -r and bzr revert -r ??
[04:26] <lifeless> one merges and one overwrites
[04:33] <Noldorin> lifeless, update merges, right?
[04:39] <Noldorin> lifeless, and what about bzr merge -pull and bzr pull - any difference?
[04:58] <lifeless> Noldorin: yes they are different - the docs should cover that one ;)
[04:58] <Noldorin> lifeless, you have too much confidence in the docs heh. the difference isn't explicitly stated ;-)
[04:59] <lifeless> Noldorin: sorry ;( - try bzr help merge; I have to head away from the keyboard, its why I'm pointing you at the docs.
[04:59] <lifeless> cao
[04:59] <Noldorin> ok sure
[04:59] <Noldorin> bye
[05:06] <Noldorin> what happens if i shelve changes, make some edits, then unshelve...do the shelved changes get merged or pulled with overwrite?
[05:07] <Noldorin> hmmm
[06:04] <Noldorin> what makes bzr say "working tree is out of date" ?
[06:06] <sili> You need a bzr update
[06:06] <Noldorin> what does that actually *mean* though?
[06:06] <Noldorin> why does it think i need a bzr update?
[06:07] <sili> you issued a command it determined the version you're working with is older than the checkout branch
[06:08] <Noldorin> sili, not using checkouts here...
[06:09] <sili> hmm. https://bugs.launchpad.net/bzr/+bug/55383
[06:10] <Noldorin> sili, the branch is not bound to anything...don't know how it can possibly claim it's "out of date"!
[06:10] <sili> did someone push a change to your branch?
[06:10] <sili> or commit there
[06:11] <Noldorin> sili, i guess not, since bzr revno gives 46, which is the latest revision in bzr log
[06:24] <Noldorin> sili, ?
[06:34] <Noldorin> well this sounds like a definite bug to me
[06:34] <Noldorin> i see no reason for it
[06:40] <aminpy> http://dpaste.com/587804/ <- can anybody help me?
[06:56] <Noldorin> hi again jelmer
[07:53] <jam> aminpy: http://dpaste.com/587804/ that is a timeout resolving "lp:"
[07:53] <jam> 2 options
[07:53] <jam> use "bzr+ssh://bazaar.launchpad.net/..." directly
[07:53] <jam> or
[07:53] <jam> upgrade to the bzr 2.4 series which will resolve lp:~... on the client instead of via Launchpad XLMRPC
[07:58] <Noldorin> hi jam. any idea about my issue?
[08:17] <Noldorin> anyone?
[08:43] <Noldorin> jelmer, let me know when you are back :-)
[08:48] <aminpy> http://dpaste.com/587858/plain/ <- can anybody help me?
[09:01] <Noldorin_> can anyone please tell me exactly why im getting "working tree out of date" on my branch?
[09:39] <Noldorin_> can anyone please tell me exactly why im getting "working tree out of date" on my branch?
[20:25] <idnar> anyone know if setuptools_bzr is still maintained? it seems to have a completely broken setup.py so I'm guessing not, but maybe I missed something
[20:38] <sam_> looking for beta testers for a new chat site www.chatnearme.com also available on mobile devices at same url
[21:34] <RenatoSilva> There's repo version of project foo. I want to patch it with a feature so I branch it as bar. But upstream goes on, and my bar branch becomes a mix of feature commits and upstream merges. I want to produce a version of the feature for last release, which is a changeset before the one I branched from, for example tagged as R_1.0. This is called backport, right?
[21:34] <RenatoSilva> But in the process of backporting the feature, I'll have to differentiate between those upstream update and feature commits, and I've got the impression it's a lot of trouble. Am I right? Is this workflow weird or ok?