| vila | hi all | 06:54 |
|---|---|---|
| mgz | morning | 08:30 |
| === kirkland` is now known as kirkland | ||
| Xtreme | guys, little help needed.. | 14:34 |
| Xtreme | well, now my php project is in /home/user/www | 14:34 |
| Xtreme | so i went to www, and did bzr init | 14:34 |
| Xtreme | then bzr add and then commit | 14:34 |
| Xtreme | now if i change any file in it, how to track the changes? and how to keep it as different versions? | 14:35 |
| Xtreme | any one? | 14:36 |
| jpds | Xtreme: Do: bzr commit --show-diff | 14:53 |
| jpds | Xtreme: After making a change. | 14:53 |
| Xtreme | jpds: and how to roll back? | 14:53 |
| Xtreme | go to previous status | 14:53 |
| jpds | Xtreme: bzr uncommit; bzr revert --no-backup | 14:54 |
| mgz | really you want to seperate your deployment from your development, but it's not too important for small things | 14:59 |
| Xtreme | okay so say i have a index.php | 15:00 |
| Xtreme | i did some coding and it working file | 15:00 |
| Xtreme | so i add and commit it | 15:00 |
| Xtreme | then say, i fucked up some thing and it got screwed | 15:00 |
| Xtreme | so if i do bzr uncommit, will i get index.php be replaced with working index.php? | 15:01 |
| jpds | Xtreme: Yes. | 15:01 |
| jpds | Xtreme: You should really read: http://doc.bazaar.canonical.com/bzr.2.5/en/mini-tutorial/index.html | 15:02 |
| jono | hey | 16:04 |
| jono | I have a 9 hour old bzr loc | 16:04 |
| jono | lock | 16:04 |
| jono | bzr break-lock isnt working | 16:04 |
| jono | any idea how I fix this? | 16:04 |
| jono | ignore me, fixed it :-) | 16:06 |
| jono | thanks! | 16:06 |
| === deryck is now known as deryck[lunch] | ||
| === deryck[lunch] is now known as deryck | ||
| maxb | jelmer: Hi. There's a compilation error in subvertpy trunk's C code. Use of -> where . is intended (left operand is a struct, not a pointer to a struct) | 18:26 |
| jelmer | maxb: fixed, thanks | 18:36 |
| maxb | thanks :-) | 18:36 |
| thomi | Question: Is there a way to move files from repo A -> repo B and keep their revision history? | 21:20 |
| thomi | I'm guessing not - but maybe there's a workaround? I'm moving code from one project to another, and I'd like to keep the history. | 21:20 |
| fullermd | Not really. In concept you could created a similar looking history for them and bring that into the new branch, but... | 21:27 |
| fullermd | Files don't have history; history has files. | 21:27 |
| jimis | On one PC I have made a no-trees branch of an lp:project, and have been working on it locally for some time | 23:28 |
| jimis | What's the best way to move *everything* on to another PC? | 23:28 |
| jimis | Oh, I've been working on it with local checkouts on a separate dir | 23:29 |
| jimis | I'm afraid I'll lose stuff (like shelves) if I just move the notrees repository and recreate a new local checkout | 23:30 |
| fullermd | I don't think there's any way to push shelves around. | 23:35 |
| jimis | fullermd: are they stored in the checkout dir and not in the no-trees repo? | 23:36 |
| fullermd | Yes, they're a property of the WT. | 23:37 |
| jimis | bummer :-) | 23:37 |
| jimis | fullermd: anything else I may lose? (besides uncommitted changes that is...) | 23:37 |
| fullermd | Everything committed would be in the branch/repo. | 23:38 |
| fullermd | Revs, tags, signatures... | 23:38 |
| jimis | alright, so I'll tar this up and only lose shelves | 23:38 |
| jimis | thanks for helping | 23:38 |
| fullermd | You could always make a temp branch and commit your shelves into it. | 23:40 |
| jimis | fullermd: I'd have to resolve many conflicts as each shelve was created a a different point in history | 23:41 |
| jimis | fullermd: any ideas how I can get the shelves in diff format? | 23:41 |
| fullermd | unshelve --preview? | 23:42 |
| jimis | (btw, until today I thought that shelves were implemented as special light branches...) | 23:43 |
| fullermd | Pretty sure shelved changed know what their basis revision was. Not sure that's exposed anywhere... | 23:43 |
| fullermd | No, they're really more a transient thing than that. I can't remember the last time I had anything shelved for more than 5 or 10 minutes. | 23:44 |
| jimis | :-( | 23:45 |
| jimis | this should be really pointed loudly, since it's unexpected to actually lose data like that in a distributed system | 23:46 |
| jimis | I use them all the time for backing off changes and switching to other branches | 23:46 |
| jimis | (I use a single-dir checkout workflow) | 23:47 |
| jimis | fullermd: I'm curious, what's your workflow? | 23:47 |
| fullermd | Nothing particularly exciting. I mostly have branch/WT coincident. | 23:48 |
| fullermd | Using shelves to back off and "whoops, I probably wanted to make that change in this other branch" is probably fairly common (though often unnecessary since switch will merge over uncommitted stuff) | 23:49 |
| fullermd | But "let me stick this stuff I don't want to lose on the shelf for a couple weeks" is a bit unexpected. | 23:50 |
| jimis | fullermd: WT? | 23:50 |
| fullermd | Working Tree. | 23:51 |
| jimis | btw, the "bzr switch" silent merging was a major headache for me at first | 23:52 |
| jimis | my instict was telling me that uncommitted changes would stay as uncommitted on the same branch for commiting when coming back | 23:53 |
| fullermd | Interesting. I'd reflexively assume just the opposite. | 23:53 |
| jimis | that would be an extra merge for me :-) | 23:56 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!