| === spiv_ is now known as spiv | ||
| === rvba` is now known as rvba | ||
| === mmrazik is now known as mmrazik|afk | ||
| === wedgwood_away is now known as wedgwood | ||
| chmac | Experiencing weirdness between bzr update / bzr commit, working with the "centralised" model, and a local bzr commit / bzr push. | 13:02 |
|---|---|---|
| chmac | Somebody else pushed changes, then I committed changes locally, when I tried bzr push I got an error. So I ran bzr merge, and then bzr commit then bzr push. | 13:03 |
| chmac | Now only my commits (including the merge) are showing in the log, it's like I wiped out the other commits, combined them into one, and attributed it to me... | 13:03 |
| chmac | Maybe I'm missing something? | 13:03 |
| chmac | Is there a neater way to achieve this workflow? | 13:03 |
| chmac | In git there's some way to merge the whole thing, while persisting each person's individual commits. Can I do something similar in bzr? | 13:04 |
| jelmer | chmac: log only shows mainline commits by default. Try "bzr log -n0" | 13:05 |
| chmac | jelmer: Nice, ok, that's what I was after... | 13:06 |
| chmac | jelmer: We're using codebase and there's some weirdness there, it doesn't show sub commits or something... | 13:07 |
| === mmrazik|afk is now known as mmrazik | ||
| jelmer | chmac: codebase? | 13:29 |
| chmac | jelmer: http://codebasehq.com/ I think | 13:46 |
| chmac | It's like a launchpad / github type service, but supports a handful of scms | 13:46 |
| chmac | Launchpad is nice, but it's expensive to get started... | 13:47 |
| Wiz_KeeD | How the hell do I remove bzr from a directory?! | 13:55 |
| jelmer | Wiz_KeeD: what do you mean exactly? | 13:58 |
| Wiz_KeeD | so it will be a simple directory not tracked by bzr so i can make a separate repository | 13:59 |
| Wiz_KeeD | to include this directory | 13:59 |
| Wiz_KeeD | otherwise i cannot make it because it complains it has child branches whatever | 13:59 |
| Wiz_KeeD | i tried remove-tree remove rm delete | 14:02 |
| mgz | you really don't want one branch containing another like that | 14:02 |
| Wiz_KeeD | yes that why i want it completly removed | 14:03 |
| Wiz_KeeD | i just deleted .bzr | 14:03 |
| mgz | but `bzr rm --keep` should do | 14:03 |
| Wiz_KeeD | i did rm without keep and still bzr info and .bzr dir is there | 14:03 |
| mgz | ...you want the whole thing gone? then just deleting .bzr is fine, or using rmbranch and moving stuff | 14:04 |
| Wiz_KeeD | deleteing then, still when i do bzr add on multiple directories including the one i've dleted bzr from | 14:10 |
| Wiz_KeeD | it still does not add them with bzr add . | 14:10 |
| Wiz_KeeD | fuck this i'm reading the tutorial from scratch | 14:17 |
| Wiz_KeeD | ok so i followed the tutorial i create a new directory i do bzr init on it i add all the contents commit to the branch then push with bzr+ssh on the server where it says the it has created a branch | 14:40 |
| Wiz_KeeD | but the directory on the server is empty...what the hell is up with that? | 14:40 |
| jelmer | Wiz_KeeD: it doesn't create a working tree on the server, just pushes the contents of the branch | 14:41 |
| jelmer | Wiz_KeeD: run "bzr co" in the directory on the server to create a working tree | 14:41 |
| Wiz_KeeD | but there is nothing there, it's completly empty | 14:41 |
| jelmer | Wiz_KeeD: there is a .bzr directory there, presumably? | 14:41 |
| Wiz_KeeD | what is the definition of a working tree then? the tutorial said you can push the content of your branch there | 14:41 |
| Wiz_KeeD | yes it is there, it has been created | 14:42 |
| Wiz_KeeD | and with that i can pull now? | 14:42 |
| jelmer | yes | 14:42 |
| Wiz_KeeD | it says i cannot pull location not specified and no working tree exists | 14:43 |
| Wiz_KeeD | the tree is the actual "server" so to speak | 14:43 |
| Wiz_KeeD | the actual mother repository? | 14:43 |
| jelmer | Wiz_KeeD: when does it say that? | 14:48 |
| jelmer | Wiz_KeeD: you'll need to specify the location to pull from the first time you pull | 14:49 |
| Wiz_KeeD | http://doc.bazaar.canonical.com/bzr.dev/en/tutorials/tutorial.html#publishing-your-branch | 14:49 |
| Wiz_KeeD | here | 14:49 |
| Wiz_KeeD | why didn't the contents of my directory get pushed on the server? | 14:49 |
| Wiz_KeeD | what about that jelmer ? | 14:57 |
| jelmer | re | 15:17 |
| jelmer | Wiz_KeeD: the contents did get pushed. have you tried running "bzr log" in the directory on the server? | 15:17 |
| Wiz_KeeD | i see the message, i don't see the contents | 15:18 |
| Wiz_KeeD | now what? | 15:18 |
| Wiz_KeeD | In the case where i develop on localhost and push modifications to server, i should have a shared repository? | 15:20 |
| jelmer | Wiz_KeeD: you can have bzr create the contents on disk by running "bzr co" on the server | 15:20 |
| jelmer | Wiz_KeeD: the contents are there, they're just stored under .bzr/ | 15:20 |
| Wiz_KeeD | ok, how did you know that? why did that happen and why didn't the files appear there in the first place? | 15:21 |
| Wiz_KeeD | i'm still confused as fuck | 15:28 |
| === mmrazik is now known as mmrazik|afk | ||
| Wiz_KeeD | hello | 17:16 |
| Wiz_KeeD | jelmer, still there? | 17:16 |
| jelmer | Wiz_KeeD: yes | 17:16 |
| Wiz_KeeD | that was quick, how are you? :) | 17:17 |
| Wiz_KeeD | jelmer, if i have my development environment on localhost and i want to ocasionally push modifications to the production server | 17:56 |
| Wiz_KeeD | what would be the best setup? | 17:56 |
| === mmrazik|afk is now known as mmrazik | ||
| === wedgwood is now known as wedgwood_away | ||
| === Logan__ is now known as Logan_ | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!