[00:34] can anyone tell me equivalent of git add -up with bzr ? [00:35] jrwren: Only git has the concept of the index, so there's no direct analogy in other VCSes. [00:36] jrwren: Other VCSes just commit whatever's in the working tree. [00:36] wgrant: thanks. [00:36] The bzr equivalent is to run 'bzr shelve' to store away the changes from the working tree that you don't want. [00:36] Then bzr commit, then bzr unshelve to get them back. [00:36] so, my editor "fixed" some source I was editing. I don't feel I should commit those fixes. I'd like to commit ONLY the lines I intended. [00:38] shelve worked well. thank you wgrant [00:39] (shelve is basically stash) [00:49] I don't know if any software-properties folks are around. I find this valuable. https://code.launchpad.net/~evarlast/software-properties/support-update/+merge/260640 [01:38] jrwren: It looks like you've proposed an Ubuntu packaging branch into the upstream trunk, which isn't going to work very well. [01:39] jrwren: You probably want to make a fresh branch of lp:software-properties, then commit on top of that and push. [02:36] wgrant: so I branched the wrong then? [02:51] jrwren: Looks to me like you branched lp:ubuntu/software-properties [02:51] wgrant: i did, but afaict they are the same thing. [02:52] how can you even tell that from the MP? [02:52] They're unrelated branches of the same codebase. [02:52] Have you seen the MP diff? :) [02:53] WTF?!?! [02:53] hahaha [02:53] Unless your change was actually 112000 lines, I think there's a problem. [02:53] i really do not understand LP and the way this stuff is done. [02:53] maybe someday. [02:54] Well, this isn't really LP-specific. [02:54] wgrant: and bzr. [02:54] wgrant: if it were git, I'd not be so confused :) [02:54] It's just that in this case the upstream project is also on LP, so it's slightly confusing. [02:54] It'd be the same if you grabbed a repo from Debian and then pushed it to the upstream developer. [02:55] i see. [02:55] yes, that is clear now. [02:55] thanks. [02:56] Remember that LP isn't Ubuntu-specific. If it's not under /ubuntu, it's probably an upstream project. === wgrant changed the topic of #ubuntu-devel to: Archive: wily open | Devel of Ubuntu (not support or app devel) | build failures -> http://qa.ubuntuwire.com/ftbfs/ | #ubuntu for support and discussion of lucid -> utopic | #ubuntu-app-devel for app development on Ubuntu http://wiki.ubuntu.com/UbuntuDevelopment | See #ubuntu-bugs for http://bit.ly/lv8soi | Patch Pilots: [02:56] i guess I thought there was bzr+lp magic making the repos the same [02:59] (Though it is heavily geared towards Ubuntu.) [03:04] i'm so bummed about this. I wrote a nice MR message and deleted the MR. Can't remember what I wrote. I should sleep instead. === doko_ is now known as doko === soee_ is now known as soee === gammax90 is now known as gammax === a|wen is now known as a|wen- === a|wen- is now known as a|wen_ === a|wen_ is now known as a|wen