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