| === r0bby is now known as robbyoconnor | |
| === jamesh__ is now known as jamesh | |
| [06:26] <syst3mw0rm> hi | |
| [06:26] <syst3mw0rm> I need some help related to bzr fast-import. | |
| [06:26] <syst3mw0rm> Anyone willing to help | |
| [06:26] <syst3mw0rm> ? | |
| [06:27] <syst3mw0rm> I want to import git repo into bzr repo..but not in trunk branch | |
| [06:29] <lifeless> just rename it afterwards ? | |
| [06:30] <lifeless> theres nothing special about individual branches in a bzr repo | |
| [06:31] <syst3mw0rm> lifeless: when I see bzr log it says the branch nick : trunk | |
| [06:31] <syst3mw0rm> what should I rename? | |
| [06:31] <syst3mw0rm> there is no folder named trunk.. | |
| [06:33] <syst3mw0rm> and when I try to push to repository whose branch nick isn't trunk..it gives me error that the branches have diverged. | |
| [06:34] <syst3mw0rm> lifeless: there? | |
| [06:36] <lifeless> syst3mw0rm: not really, dinner time for family, sorry. | |
| [06:36] <lifeless> in the output of the import there should be a subdirectory called trunk, if you imported the whole repo | |
| [06:37] <lifeless> if you used bzr branch from git, then it outputs a single branch to the folder of your choice. | |
| [06:37] <lifeless> jelmer, who wrote this, will be coming on line soon | |
| [06:40] <syst3mw0rm> lifeless: no problem. and thanks for help. | |
| [06:41] <syst3mw0rm> hi jelmer! | |
| [07:27] <_science> So if i want to see a diff for a specific file in a specfic commit how would i go about that? :) | |
| [07:31] <lifeless> bzr diff -c commitnumber path/to/file | |
| [07:50] <_science> cheers. | |
| [08:02] <mgz> morning! | |
| [08:43] <jelmer> syst3mw0rm: hi | |
| [08:45] <syst3mw0rm> Hey jelmer | |
| [08:45] <syst3mw0rm> I need a little help with bzr fast-import | |
| [08:47] <syst3mw0rm> I have a git repository..and I commit my code to this repo. But at regular intervals..I want to push this code to a bzr repo as well.. | |
| [08:47] <syst3mw0rm> Initially there was only one bzr repo, I created git repo using git fast-import from this bzr repo..because I like GIT (and github) more than bzr. | |
| [08:48] <syst3mw0rm> but I want the original bzr repo to reflect the changes I am pushing to github. | |
| [08:48] <syst3mw0rm> I have two questions.. | |
| [08:49] <syst3mw0rm> 1. Do I need to rebuild the whole bzr repo from git repo everytime I want to push changes to remote bzr server? or incremental changes can work? | |
| [08:49] <syst3mw0rm> 2. When I create bzr repo using bzr fast-import it imports changes in trunk branch.. | |
| [08:49] <syst3mw0rm> I don't want that. | |
| [08:49] <AfC> I love how people keep coming here asking how they can _not_ use Bazaar. | |
| [08:50] <syst3mw0rm> I want changes to be imported to some other branch...otherwise I get error message that branches have diverged. | |
| [08:51] <jelmer> syst3mw0rm: yes, fastimport supports incremental imports | |
| [08:51] <syst3mw0rm> AfC: haha..:) Its not like I don't like bzr..the main reason is we don't have something like github for bzr. | |
| [08:52] <syst3mw0rm> jelmer: ok. how to tackle the branch issue? my second question. | |
| [08:53] <AfC> syst3mw0rm: well, since bzr works on top of a git repo (or better yet you can branch from a git repo to a bzr one and work there) there's really not much reason not to use bzr as a front end at least, and a working tree optimally. | |
| [08:58] <jelmer> syst3mw0rm: what is the problem with the branch being named 'trunk' ? you can do the import in some other repository too and then pul thje trunk branch from there into whatever branch you want to have locally | |
| [09:00] <syst3mw0rm> jelmer: I don't know how to do it..can you please explain me the steps to follow. I didn't find much documentation about it. | |
| [09:01] <syst3mw0rm> Git repo : https://github.com/syst3mw0rm/hyperkitty | |
| [09:01] <syst3mw0rm> bzr repo : http://bzr.fedorahosted.org/bzr/hyperkitty/gsoc/changes (bzr://bzr.fedorahosted.org/bzr/hyperkitty/gsoc) | |
| [09:02] <syst3mw0rm> I have both repo on my system. | |
| [09:03] <syst3mw0rm> Git repo is having more commits..I want to copy all the commits from git repo not in bzr repo and paste it in bzr repo..so both will have same data. | |
| [09:04] <syst3mw0rm> I am using bzr fast-export-from-git /git/repo/path project.fi | |
| [09:05] <jelmer> syst3mw0rm: I haven't done this myself either, though I know it is possible | |
| [09:05] <jelmer> I would usue bzr-git to mirror a git repository into bzr | |
| [09:05] <syst3mw0rm> but then it exports all commits and don't ignore the commits already there in my bzr repo. | |
| [09:06] <syst3mw0rm> jelmer: ok | |
| [09:06] * syst3mw0rm checks out bzr-git | |
| [09:09] <syst3mw0rm> I can't find the documentation for this project.. | |
| [09:09] <syst3mw0rm> only launchpad project page | |
| [09:09] <jelmer> syst3mw0rm: it just adds support for git repositories as a branch format supported by bzr | |
| [09:10] <jelmer> so you can just use 'bzr branch' and 'bzr pull' for mirrorring | |
| [09:10] <syst3mw0rm> how do I use it? | |
| [09:10] <syst3mw0rm> oh..I see. | |
| [09:14] <syst3mw0rm> I am getting error when trying to push to original bzr repo, the branches have diverged.. | |
| [09:14] <syst3mw0rm> How to resolve it? | |
| [09:16] <jelmer> syst3mw0rm:bzr-git and bzr-fastimport are incompatible | |
| [09:16] <jelmer> so if you want to use bzr-git you'll have to start the bzr branch from scratch | |
| [09:18] <mgz> shelve ignoring +x is annoying | |
| === zyga is now known as zyga-afk | |
| === zyga-afk is now known as zyga | |
| [14:12] <bloodearnest> heya - I have a question regards the launchpad --fixes interaction - is there a way to just reference (link) the bug without changing the status to "Fix Released" on push? | |
| [14:14] <mgz> that's the default behaviour | |
| [14:18] <mgz> bloodearnest: as in, just pushing a branch with a bug linked does change task status, so launchpad does what you want | |
| [14:20] <jelmer> mgz: s/does/doesn't/ ? | |
| [14:20] <bloodearnest> mgz, sorry, I meant "Fix Commited", and I don't want the status changed | |
| [14:20] <mgz> launchpad doesn't change the status. | |
| [14:21] <mgz> people run little helper bots against launchpad if they want to automatically change statuses | |
| [14:21] <bloodearnest> mgz, right - we have one of those bots to sync with kanban cards, so I must be seeing the status changed via that and getting confused | |
| [14:22] <bloodearnest> thanks | |
| [14:23] <mgz> you should be able to remove the lp bug number from the kanban card, or set a description to prevent syncing | |
| [14:24] <bloodearnest> mgz, I think the kanban sync is ok - it just happend at the same time I pushed a --fixes comment, so I thought that had done it | |
| [14:26] <bloodearnest> mgz: we have a custom leankit sync bot - is there a general sync option available? | |
| [14:27] <mgz> no, but lots of people have bots | |
| [14:28] <mgz> how does yours compare to lp:lp2kanban for instance? | |
| [14:33] <bloodearnest> mgz: not sure, I've not worked on it, but it's a two way sync | |
| [14:37] <bloodearnest> seems the App Store haz issues: http://www.marco.org/2012/07/04/app-store-corrupt-binaries | |
| === zyga is now known as zyga-afk | |
| === zyga-afk is now known as zyga | |
| [15:54] <psusi> is there a bzr equivalent to git describe? | |
| [15:55] <psusi> i.e. tell me what version this tree is | |
| [15:58] <mgz> `bzr revno` and `bzr revno --tree` depending on what exactly you want | |
| [16:00] <psusi> ahh, thanks | |
| === zyga is now known as zyga-afk | |
| === zyga_ is now known as zyga | |