| === krow_ is now known as krow | ||
| === hexsprite_ is now known as hexsprite | ||
| Noldorin | what's the difference between bzr update -r and bzr revert -r ?? | 04:18 |
|---|---|---|
| lifeless | one merges and one overwrites | 04:26 |
| Noldorin | lifeless, update merges, right? | 04:33 |
| Noldorin | lifeless, and what about bzr merge -pull and bzr pull - any difference? | 04:39 |
| === TiffanyAngel87 is now known as sili | ||
| 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:58 |
| 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 | 04:59 |
| Noldorin | what happens if i shelve changes, make some edits, then unshelve...do the shelved changes get merged or pulled with overwrite? | 05:06 |
| Noldorin | hmmm | 05:07 |
| Noldorin | what makes bzr say "working tree is out of date" ? | 06:04 |
| 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:06 |
| sili | you issued a command it determined the version you're working with is older than the checkout branch | 06:07 |
| Noldorin | sili, not using checkouts here... | 06:08 |
| sili | hmm. https://bugs.launchpad.net/bzr/+bug/55383 | 06:09 |
| ubot5 | Ubuntu bug 55383 in Bazaar "bzr status should say if the working tree of a branch is out of date" [Low,Fix released] | 06:09 |
| 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:10 |
| Noldorin | sili, i guess not, since bzr revno gives 46, which is the latest revision in bzr log | 06:11 |
| Noldorin | sili, ? | 06:24 |
| Noldorin | well this sounds like a definite bug to me | 06:34 |
| Noldorin | i see no reason for it | 06:34 |
| aminpy | http://dpaste.com/587804/ <- can anybody help me? | 06:40 |
| Noldorin | hi again jelmer | 06:56 |
| 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:53 |
| Noldorin | hi jam. any idea about my issue? | 07:58 |
| Noldorin | anyone? | 08:17 |
| Noldorin | jelmer, let me know when you are back :-) | 08:43 |
| aminpy | http://dpaste.com/587858/plain/ <- can anybody help me? | 08:48 |
| Noldorin_ | can anyone please tell me exactly why im getting "working tree out of date" on my branch? | 09:01 |
| === Mkaysi_ is now known as Mkaysi | ||
| Noldorin_ | can anyone please tell me exactly why im getting "working tree out of date" on my branch? | 09:39 |
| === hexsprite_ is now known as hexsprite | ||
| === medberry is now known as med_out | ||
| 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:25 |
| sam_ | looking for beta testers for a new chat site www.chatnearme.com also available on mobile devices at same url | 20:38 |
| 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? | 21:34 |
| === yofel_ is now known as yofel | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!