| === sagaci_ is now known as sagaci | ||
| cheater_ | hi | 12:55 |
|---|---|---|
| cheater_ | i have a slight issue understanding something. i understand there can be two types of repositories that i have on my hard drive, one is a repository from which i can create new checkouts (and could act as a central repo) and another one needs the original repository to work. is that correct? | 12:56 |
| AuroraBorealis | you are probably thinking about branches vs lightweight checkouts? | 12:58 |
| cheater_ | possibly | 12:58 |
| AuroraBorealis | a branch has the entire history | 12:58 |
| cheater_ | how do i create either of them? | 12:58 |
| AuroraBorealis | a lightweight checkout doesn't have history | 12:58 |
| cheater_ | as in, the commands | 12:59 |
| AuroraBorealis | or it could be a checkout of a repository, which means that it needs to access the repo to pretty much do anything | 12:59 |
| cheater_ | ah yes, i am probably thinking branch vs checkout | 12:59 |
| cheater_ | is there a reliable way to tell those two apart? | 12:59 |
| AuroraBorealis | http://doc.bazaar.canonical.com/latest/en/user-reference/init-repository-help.html | 12:59 |
| cheater_ | let me look at that very quickly | 13:00 |
| AuroraBorealis | http://doc.bazaar.canonical.com/latest/en/user-reference/checkouts-help.html | 13:01 |
| AuroraBorealis | the difference between branches and a heavy checkout is the 'location' to where it commits | 13:01 |
| AuroraBorealis | as in if its bound or not | 13:01 |
| AuroraBorealis | not sure how to tell a branch from a checkout | 13:02 |
| cheater_ | would this not register in the branches registered somewhere in bzr metadata? | 13:03 |
| AuroraBorealis | im sure it is | 13:03 |
| AuroraBorealis | not sure if there is any nice command to tell | 13:03 |
| cheater_ | see i have four source trees here | 13:04 |
| cheater_ | i did a heavyweight branch just before the central server got hit by a meteorite | 13:04 |
| AuroraBorealis | o.o | 13:04 |
| cheater_ | it's one of them and i need to figure out which | 13:05 |
| AuroraBorealis | well | 13:05 |
| cheater_ | also, one of these trees which is what i have been working out of is a lightweight checkout | 13:05 |
| AuroraBorealis | if its a lightweight checkout | 13:05 |
| AuroraBorealis | then it WONT have history | 13:05 |
| AuroraBorealis | the other 3 options it should still have history. | 13:05 |
| cheater_ | yeah | 13:05 |
| AuroraBorealis | and it should not matter which one it is | 13:05 |
| cheater_ | if i go there and do cat .bzr/branch/branch.conf then it shows me bound = True and bound_location = sftp://whatever | 13:06 |
| cheater_ | that is evident of it being a lightweight checkout right? | 13:06 |
| AuroraBorealis | not necessarilly | 13:06 |
| AuroraBorealis | A checkout is created with the bzr checkout command (see “help checkout”). You pass it a reference to another branch, and it will create a local copy for you that still contains a reference to the branch you created the checkout from (the master branch). Then if you make any commits they will be made on the other branch first. This creates an instant mirror of your work, or facilitates lockstep development, where eac | 13:06 |
| AuroraBorealis | h developer is working together, continuously integrating the changes of others. | 13:06 |
| AuroraBorealis | However the checkout is still a first class branch in Bazaar terms, so that you have the full history locally | 13:06 |
| AuroraBorealis | just means that when you commit, its gonna commit to the remote place first | 13:07 |
| AuroraBorealis | and then commit locally | 13:07 |
| AuroraBorealis | basically mimics svn in a way | 13:07 |
| cheater_ | so how can i tell if a checkout is lightweight? | 13:07 |
| AuroraBorealis | try doing bzr log on it | 13:07 |
| AuroraBorealis | i guess | 13:07 |
| cheater_ | where is the difference in meta data? | 13:07 |
| AuroraBorealis | i am not that exierenced in bzr's internals so im not sure | 13:08 |
| cheater_ | what should it do? bzr log | 13:08 |
| AuroraBorealis | well | 13:08 |
| AuroraBorealis | bzr log wont work if its lightweight | 13:08 |
| AuroraBorealis | cause it has no history | 13:08 |
| AuroraBorealis | one sec let me try a lightweight checkout | 13:08 |
| cheater_ | thanks | 13:08 |
| cheater_ | i currently do not have any working bzr infrastructure so can't check myself | 13:08 |
| jelmer | hi AuroraBorealis, cheater_ | 13:10 |
| cheater_ | hi jelmer | 13:11 |
| AuroraBorealis | it seems a lightweight checkout | 13:12 |
| AuroraBorealis | just doesnt have a .bzr/repository folder | 13:12 |
| cheater_ | heh | 13:14 |
| cheater_ | all the source trees have that | 13:15 |
| cheater_ | funny! | 13:15 |
| jelmer | AuroraBorealis: right, the point of a lightweight checkout is that is uses a branch/repository that is located elsehwere | 13:16 |
| AuroraBorealis | yeah | 13:16 |
| AuroraBorealis | he just lost his remote repository | 13:16 |
| AuroraBorealis | but since none of his source trees are lightweight, they should still have all the history | 13:16 |
| AuroraBorealis | up to the point from when they were last updated / merged / whatever | 13:16 |
| jelmer | cheater_: what's the problem you're trying to solve exactly? | 13:17 |
| cheater_ | yeah there is actually no discrepancy in what commits they contain | 13:17 |
| cheater_ | as in all the source trees are up to date | 13:17 |
| AuroraBorealis | <cheater_> i did a heavyweight branch just before the central server got hit by a meteorite | 13:17 |
| AuroraBorealis | thats his problem | 13:17 |
| AuroraBorealis | :> | 13:17 |
| cheater_ | jelmer: i have been working on a single-person project with just one main branch, using a "centralized" workflow with a bzr repo being available via sftp off a server, and a local checkout on my home computer | 13:18 |
| cheater_ | the server doesn't exist anymore | 13:18 |
| cheater_ | i want to resume my work | 13:18 |
| jelmer | cheater_: you should be able to unbind your local branch, if it was a heavyweight checkout | 13:18 |
| cheater_ | just before the server went away i came in here anticipating it, and you guys told me to do some specific kind of checkout or branch | 13:18 |
| cheater_ | i guess you told me to do a branch | 13:18 |
| cheater_ | so i did | 13:18 |
| cheater_ | ok how do i do that jelmer? | 13:19 |
| AuroraBorealis | bzr unbind probably | 13:19 |
| cheater_ | let me try that then | 13:19 |
| jelmer | cheater_: if it's a heavyweight checkout, then "bzr unbind" should work | 13:19 |
| cheater_ | let me just make a copy of that dir | 13:20 |
| cheater_ | nice | 13:21 |
| cheater_ | i just added a file and committed | 13:21 |
| cheater_ | Committed revision 42. | 13:21 |
| cheater_ | funny thing given that i started reading the hitchhiker trilogy lately.. | 13:22 |
| cheater_ | ok, great! | 13:22 |
| AuroraBorealis | =P | 13:22 |
| cheater_ | and branching works too | 13:23 |
| cheater_ | amazing | 13:23 |
| cheater_ | thanks a lot guys | 13:23 |
| AuroraBorealis | :D | 13:24 |
| cheater_ | there might still be some life left in this project | 13:24 |
| AuroraBorealis | back it up again though :> | 13:24 |
| cheater_ | yeah it's backed up | 13:25 |
| cheater_ | raid is backup, right? | 13:25 |
| sjamaan | Hi. I'm trying to find the bzr library API. The link in the manual points to http://starship.python.net/crew/mwh/bzrlibapi/ but that's empty | 13:26 |
| sjamaan | Anywhere else I can look? | 13:26 |
| AuroraBorealis | well i meant on another server =P | 13:26 |
| cheater_ | AuroraBorealis: heheh, i was just kidding. | 13:26 |
| === cheater_ is now known as cheater2 | ||
| === yofel_ is now known as yofel | ||
| === Noldorin_ is now known as Noldorin | ||
| gutworth | is there some option I can pass to disable the progress bar? | 21:50 |
| beuno | gutworth, I think -q may do it | 22:49 |
| gutworth | mm, too bad it's not global | 22:57 |
| bob2 | isn't there an env var? | 23:00 |
| gutworth | BZR_PROGRESS_BAR beautiful | 23:05 |
| Noldorin | hey wgz | 23:56 |
| Noldorin | err, mgz :-) | 23:56 |
| mgz | I'm... not really still awake | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!