[00:05] thanks, ok I reverted fine, but same problem. Added drupal and then tried a commit and it freezes. [00:07] Hit Ctrl+C. What's the traceback, and what does .bzr.log contain? [00:10] here's the log [00:11] The logs 50 lines. Should I paste it? [00:15] Ok, here it is. The directory I'm trying to commit is called "Pressflow: [00:15] "Pressflow" [00:15] Sun 2010-02-07 00:04:10 +0000 [00:15] 0.078 bzr arguments: [u'commit', u'-m', u'Pressflow added, initial commit'] [00:15] 0.121 looking for plugins in /root/.bazaar/plugins [00:15] 0.227 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins [00:15] 0.293 encoding stdout as sys.stdout encoding 'UTF-8' [00:15] 0.432 opening working tree '/' [00:15] 0.452 preparing to commit [00:15] [32516] 2010-02-07 00:04:11.319 INFO: Committing to: / [00:15] 0.481 Selecting files for commit with filter None [00:15] [32516] 2010-02-07 00:04:11.393 INFO: added var [00:15] 214.781 Traceback (most recent call last): [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 842, in exception_to_return_code [00:15] return the_callable(*args, **kwargs) [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1037, in run_bzr [00:15] ret = run(*run_argv) [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 654, in run_argv_aliases [00:15] return self.run(**all_cmd_args) [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3058, in run [00:15] exclude=safe_relpath_files(tree, exclude)) [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in write_locked [00:15] result = unbound(self, *args, **kwargs) [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 197, in commit [00:15] result = WorkingTree3.commit(self, message, revprops, *args, **kwargs) [00:15] File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in write_locked [00:15] result = unbound(self, *args, **kwargs) [00:16] File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 229, in commit [00:16] *args, **kwargs) [00:16] File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 360, in commit [00:16] self._update_builder_with_changes() [00:16] File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 633, in _update_builder_with_changes [00:16] self.work_tree, self.basis_revid, iter_changes): [00:16] File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 637, in record_iter_changes [00:16] for change in iter_changes: [00:16] File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 654, in _filter_iter_changes [00:16] for change in iter_changes: [00:16] File "_dirstate_helpers_pyx.pyx", line 1410, in bzrlib._dirstate_helpers_pyx.ProcessEntryC.__next__ [00:16] File "_dirstate_helpers_pyx.pyx", line 1683, in bzrlib._dirstate_helpers_pyx.ProcessEntryC._iter_next [00:16] File "_dirstate_helpers_pyx.pyx", line 1782, in bzrlib._dirstate_helpers_pyx.ProcessEntryC._loop_one_block [00:16] File "_dirstate_helpers_pyx.pyx", line 1107, in bzrlib._dirstate_helpers_pyx.ProcessEntryC._process_entry [00:21] hello [00:21] is there a way to export my current working tree as an archive? [00:22] sort of like bzr export, but for uncommitted changes [00:22] RyNy_: please don't paste like that in the channel [00:22] sorry, what's the best way to share a log file?? [00:22] RyNy_: dpaste.com [00:23] Stavros: thanks, will use this from now on [00:24] any idea how i can export uncommitted changes? [00:28] Stavros: how about "bzr diff"? [00:28] Stavros: or did you only add files? [00:28] gerard_: i did add some files as well, yes [00:28] i'd like to transfer everything so i can continue working on a different machine [00:29] Stavros: you should push to a (private) branch then [00:29] i'd need to commit for that, and i don't want to commit unfinished work [00:29] Stavros: how often do you commit? [00:29] I usually commit twice every hour [00:29] as often as i'm done working on a feature [00:30] this one is a large one [00:30] usually it's not a problem [00:30] ok [00:30] how about you commit and then uncommit when you resume working? [00:31] doesn't that preserve my commit somewhere? [00:31] i always see uncommit mention something about a tip [00:31] yeah, you can "undo" an uncommit [00:32] the head is saved (bzr heads --all will show it) [00:32] hmm, can i remove it? [00:32] why would you? [00:32] it will not be pushed anyway [00:32] oh [00:32] that's fine then, thanks [00:32] so it's safe to store private info there? [00:32] say, if i accidentally include a password in a file [00:33] is it safe to uncommit or do i need to scrap the repo? [00:33] hmm [00:34] I think that uncommit and then pack and then removing the obsolete packs will also clean it up [00:34] I'm not too sure though [00:35] hmm, i'll try that and see, thanks [00:36] Peng: Ok, I basically started over, deleted the .bzr directory and am able to commit fine now. Weird [00:40] General question: is it ok to add a whole LAMP server under version control. At this point I'm not collaborating with anyone but want to use VC to checkpoint good known states of the LAMP install. [00:41] Or would it be better to break up my add commands to individual directories? [00:47] RyNy_: it's all just textfiles right? [00:47] you can add them all in one go [00:47] it's not that useful to have a commit with only half of the files needed to run the thing [00:48] gerard_: yes, all text files for now. [00:48] I plan on running Drupal so there will be images sometime soon. [00:50] I think it's best to just put the configuration under version control [00:51] I could use the .bzrignore file to ignore the images directory of Drupal [00:56] yeah it depends on if you want to be able to restore them.... [00:57] gerard_: thanks. so, I tried to add the whole server and got this error: http://dpaste.com/155621/ [00:58] I was having problems all day trying to add the same directory var/www/pressflow. [00:58] what? [00:59] that looks weird [00:59] adding dev/.udev/db/\x2fblock\x2fram0 [00:59] you sure you are not adding /dev ? [00:59] I tried to add the server and then it crashed. [01:00] I was at / and issued the command bzr add [01:00] hmm, that's not what you want [01:00] I guess you'd just want to put /etc and /var/www under version control [01:01] /dev contains the special files [01:01] /dev/mem is a virtual file that points to your ram [01:01] quite hard to version control that one.... [01:01] and there is lots more there [01:05] I can't find that directory. Where's dev/ [01:05] RyNy_: Did you keep a copy of the old data? It would be nice if someone could debug it. [01:06] Peng_: Yes [01:09] Ok, I found dev it's at root. I will try to include that in the ignore file and see what happens [01:09] Peng_: If you want the log let me know. Happy to post it somewhere. [01:14] Adding your entire computer seems like a very bad idea. [01:14] Aside from all the special stuff like /dev and /proc, who cares about /usr/lib? [01:15] Vesta? 8-} [01:20] thx [01:23] Sorry for the basic question, but I take it that /etc gets customized a lot? [01:24] Sure, versioning /etc is a good idea. Check out etckeeper. === gerard_ is now known as gerard_away [01:40] Oh my god. [01:40] 'times' for bzr check: 3664m48.353s 1118m2.436s [01:41] o_0 [01:42] That's on Emacs. [01:46] wow [05:01] quotemstr: check is not tuned as much as [say] commit :) [05:06] Also it has SETI@home embedded. ;-) [05:06] hehehe [05:15] Peng: something for everyone [05:24] how do i update a checkout to a particular version? (if that's possible). 'updated' does not have an -r options.... [05:25] pull -r or merge -r? [05:26] okay [05:26] that will work for a checkout? [05:26] (i know, i should test it... i'm kind of in a jam right now is the thing) [05:27] BTW, update recently gained a -r argument. [05:27] (It's in 2.1.0rc1; dunno about 2.0.) [05:27] yay [05:28] oh, cool. [05:29] bzr help update still doesn't list it (in 2.1.0rc2) [05:29] Ehh. It does for me. [05:29] Maybe it's only in bzr.dev? [05:29] (I mean, I'm on bzr.dev. I don't know exactly when it was added, but I thought it was maybe 6 weeks ago.) [05:37] 2.1.0rc2 has update -r for me. [05:40] ah, i have 2.0.3. i'm mis-reading bzr-uilddebs error messag :s [05:56] let's say i'm at revision 100, and foo.txt was removed in revision 90. i want to restore foo.txt. what's the best way to do this? [05:57] i tried merge -r90..89 foo.txt, but bzr doesn't like that it doesn't see foo.txt in 100 [05:59] nevermind, found a stackoverflow thread addressing this. (if anyone wants to see it, let me know) [06:00] johnjosephbachir: should include it here for the logs :) [06:00] http://stackoverflow.com/questions/1626507/bzr-restoring-a-deleted-file-after-some-commits-with-bazaar [06:04] johnjosephbachir: bzr revert -r 90 foo.txt, IIRC [06:04] yep, worked like a charm [10:53] hi [13:11] how can i checkout a certain revision of a bzr branch ? [13:17] hicham: many things, including "branch", can take -r [13:18] mzz : thanks a lot ! [13:19] np === gerard_ is now known as gerard_away [15:03] I made a mistake :) [15:04] $ bzr push lp [15:04] Created new branch. [15:04] What I meant to do is that bzr push lp:panther [15:07] Well, don't do that ;p [15:07] fullermd, But I'm drunk!!! ;) [15:08] fullermd, Can I rollback?? [15:08] Don't drink and DVCS. [15:08] fullermd, pls leave it, I need it to be rolled back [15:08] There's nothing to "rollback" per se. You just created a branch you presumably don't need, so just rm it. [15:09] fullermd, How? [15:09] rm -rf? [15:09] It's just a filesystem directory. [15:10] fullermd, Thnaks a lot. I'm continue drinking.... thanks a lot dude... ;) [15:39] Hi all === gerard_ is now known as gerard_away [16:34] Using "rm -rf" while drinking can't be a good idea... [16:36] Ah, that's what backups are for... === radoe_ is now known as radoe [16:42] Is there a way to manually remove revisions from a repo? [16:44] I think my repo has gotten corrupted somehow, probably due to someone doing non-standard stuff with bzr-svn and merges [18:40] morning === Toksyury1l is now known as Toksyuryel [20:46] Heyho! [20:57] Is it possible to create something like a bzr-session (an interactive mode/you can execute multiple commands)? [21:04] bzr shell [21:07] bob2: ah, my bzrtools installation was broken, thanks === gerard_away is now known as gerard_ === quotemstr_ is now known as quotemstr