|
[01:43] <paperMonolith_> hello, i just installed bazaar in vista64, i seem unable to revert fils to previous versions, i tried command line and it does nothing and in the browser the option appears greyed out. in the log it shows that there clearly are several revisions. if this is a common issue, could you please point me to the solution, if this is a noobish thing, please point me in the right direction, thank you. |
|
[02:14] <bob2> paperMonolith_: what command are you running? |
|
[02:21] <paperMonolith_> the one in the docs: in the intended folder i do "bzr revert <file>" |
|
[02:21] <paperMonolith_> but i think i now understand the problem |
|
[02:22] <paperMonolith_> if i change the file, and don't comit, it lets me revert. but i can't seem to revert to previous commits |
|
[02:22] <paperMonolith_> should i be using uncommit? |
|
[02:23] <jam> paperMonolith_: bzr revert -r -2 file |
|
[02:23] <jam> you have to specify what you want to revert back to |
|
[02:23] <jam> by default "bzr revert" reverts to the last commit |
|
[02:23] <paperMonolith_> oh, i see. thank you then :) |
|
[02:24] <paperMonolith_> it worked. thank you :) |
|
[02:26] <paperMonolith_> when i do this, the last commit for this file dies or does it have a backup? if it has a backup, how do i access it? |
|
[02:28] <fullermd> revert doesn't do anything with commits. |
|
[02:28] <fullermd> It only changes the file in your working copy. |
|
[02:31] <paperMonolith_> ah. ok. i understand. thank you. |
|
=== samurai is now known as samiam |
|
=== cprov is now known as cprov-zzz |
|
[10:58] <pst> I would like to use NestedTrees and have read http://bazaar-vcs.org/BazaarFormats. It looks like I need dirstate-with-subtree but it says not recommended for use - what are my options for nested trees? |
|
[11:26] <fullermd> pst: There aren't really any, NestedTrees are only partially implemented. |
|
[11:27] <pst> fullermd: well thats a pitty, do you have any advice on how high the risk is? :) |
|
[11:28] <fullermd> Well... what's there is incomplete, what is complete mostly doesn't have a UI, and I think it bears an incomplete relationship to the feature as it's currently planned to actually be completed. |
|
[11:29] <fullermd> I wouldn't try using it unless you were planning to catch up and help develop it... |
|
[11:29] <pst> I doubt my programming skills are good enough for that |
|
[11:30] <pst> thanks anyway, now i need to find another way to accomplish something similar |
|
[11:30] <fullermd> You can look into the scmproj plugin (I think that's what it's called) |
|
[11:30] <pst> I will do that, thanks a lot |
|
[11:35] <LarstiQ> it is, http://launchpad.net/bzr-scmproj |
|
[11:38] <pst> found it already will give it a try and see if it is a fit |
|
[16:48] <LeoNerd> I may have asked before, how but safe is it to use rsync to push a mirror of a bzr repo tree, for offsite backup purposes? |
|
[17:45] <jetole> hey guys. I just started working with bzr from two different locations, how do I update my files on this computer so they are current from the commit I did on another computer when this computer already has the repo setup |
|
[17:45] <jetole> i.e. I was working from home computer. Did a commit, checked out from work and did a commit at work and now I want my home computer to have the commit I did at work? |
|
[17:46] <LarstiQ> jetole: `bzr pull` if you are working with branches, or `bzr update` for checkouts |
|
[17:47] <jetole> I think update since I want all the local checkout on each computer to be kept in sync? |
|
[17:47] <jetole> does that sound right? |
|
[17:47] <jetole> they are both working with the same branch I believe |
|
[17:48] * jetole tries update |
|
[17:48] <jetole> update looks right. It shows the modded file and shows that I have changed to the latest commit # |
|
[17:48] <jetole> thanks LarstiQ |
|
[17:49] <LarstiQ> np |
|
[22:38] <lifeless> jelmer: hi |
|
[22:44] <jelmer> lifeless, moin |
|
[22:44] <lifeless> got, oh 10 minutes for me? |
|
[22:45] <lifeless> https://code.edge.launchpad.net/~lifeless/subunit/progress-gtk/+merge/9487 got partially reviewed by you the other day |
|
[22:45] <lifeless> https://code.edge.launchpad.net/~lifeless/subunit/subunit2junitxml/+merge/9534 is a new [tiny] branch |
|
[22:46] <jelmer> lifeless: so, the gtk one I did fully review but my network was gone by the time I was submitting my review |
|
[22:47] <lifeless> /o\ |
|
[22:48] <ronny> hmm |
|
[22:48] <ronny> i could use some sample code doing a directory rename with MemoryTree |
|
[22:50] <jelmer> lifeless, submitted again |
|
[22:50] <lifeless> thanks jelmer |
|
[22:50] <lifeless> the subunit2junitxml one is _tiny_ |
|
[22:50] <lifeless> (just skip the untouched gtk stuff :P) |
|
[22:52] <jelmer> heh, that's trivial indeed |
|
[22:53] <lifeless> thats really the point of subunit :P |
|
[22:53] <lifeless> so, with that, you could replace the buildfarm with hudson rather easily ;P) |
|
[22:53] <jelmer> how'd your talk go? |
|
[22:54] <lifeless> well I think |
|
[22:54] <lifeless> couple of interesting after-talk discussions |
|
[22:54] <jelmer> lifeless, Thanks, there's things I enjoy better than setting up java on outdated and remote tru64 machines :-P |
|
[22:55] <lifeless> would have been nice to point at lots of projects using it; but at the heart of it I don't think thats actually important - it simply reflects network effects |
|
[22:55] <lifeless> jelmer: well, thats true. [64, heh, heh]. What I mean to say is that splitting out separate projects can be good :) |
|
[22:56] * jelmer nods |
|
[22:59] <jelmer> lifeless, do you know if there's a release of check with the subunit support yet? |
|
[22:59] <lifeless> no |
|
[22:59] <lifeless> I've been meaning to poke about doing a release. |
|
[23:00] <lifeless> jelmer: why the objection to catching AE? |
|
[23:00] <jelmer> lifeless, it doesn't necessarily mean that accessing that function was what threw the AttributeError |
|
[23:02] <lifeless> fair enough; I flip to and from on this point |
|
[23:03] <lifeless> heh, typo you missed |
|
[23:06] <lifeless> jelmer: http://paste.ubuntu.com/242682/ - incremental |
|
[23:07] <SamB> jelmer: what's this other thing on fetch.py:1073? |
|
[23:08] <jelmer> lifeless, +1 |
|
[23:08] <jelmer> SamB, replay range allows you to do multiple replays in a row |
|
[23:08] <jelmer> saves some roundtrips |
|
[23:09] <jelmer> once replay works it may be interesting to look at it |
|
[23:11] <lifeless> jelmer: I'll probably play with stacked progress during the week |
|
[23:11] <lifeless> jelmer: after thats finalised I'm going to look at a 0.2 release |
|
[23:11] <jelmer> lifeless, anyway, looking forward to trying out the gtk stuff with samba :-)) |
|
[23:11] <jelmer> lifeless, cool |
|
[23:12] <lifeless> jelmer: I'd really love it if you could fix the perl bugs soon |
|
[23:12] <lifeless> https://bugs.edge.launchpad.net/subunit/+bugs |
|
[23:14] <SamB> jelmer: oh, any particular reason the UA field is so wierd looking? |
|
[23:14] <SamB> User-Agent: SVN/1.6.1 (r37116)/bzr1.18dev+bzr-svn0.6.4dev0 neon/0.28.4 |
|
[23:14] <jelmer> SamB, because of the svn client libs |
|
[23:15] <SamB> jelmer: which part do you supply ? |
|
[23:15] <jelmer> SamB, the string bzr1.18dev+bzr-svn0.6.4dev0 |
|
[23:15] <SamB> okay ... |
|
[23:15] <SamB> so why the heck do they put that after a slash ... |
|
[23:15] <jelmer> the rest is not controlled by bzr-svn |
|
[23:17] <SamB> jelmer: yeah, I realize you don't control all of it -- that's why I asked ;-) |
|
[23:24] <lifeless> jelmer: do you think thats possible? |
|
[23:34] <vxnick> hello sailors |
|
[23:34] <vxnick> wrong channel... :P |
|
[23:35] * vxnick slips back into the shadows |
|
[23:35] <lifeless> lol |
|
[23:47] <SamB> jelmer: so what repositories do you test this on, anyway? |
|
[23:50] <jelmer> SamB, testsuite |
|
[23:51] <lifeless> jelmer: do you think you'll have time to fix the perl bugs in the subunit bugtracker over the next weekish ? |
|
[23:51] <jelmer> lifeless: Not sure, I'm a bit short on time at the moment having just come back from 4 weeks of travel |
|
[23:52] <lifeless> ok |
|
[23:57] * SamB *still* wants DWARF frame info in subvertpy |
|
[23:59] <lifeless> jelmer: have you written perl output bindings at this stage? |
|
|