| ccxCZ | sproaty: you can replace the content of the repo's working directory with the code and commit it. or alternatively make unified diff an apply it | 00:06 |
|---|---|---|
| sproaty_ | ccxCZ, so copy my current dir contents somewhere, checkout my branch into that folder then move my back over? | 00:13 |
| sproaty_ | move my code* | 00:13 |
| ccxCZ | it's one of possibilities, actually I'd rather suggest rsync -av --delete --exclude .bzr code/ new_branch/ | 00:19 |
| ccxCZ | that will make sure you leave the .bzr dir intact and copy over all files along with permissions etc. | 00:20 |
| fullermd | I'd make a temporary branch, rm away all the files in the WT, then move the .bzr dir into the existing place. | 00:22 |
| fullermd | (well, I guess you could skip the rm'ing and just mv .bzr) | 00:22 |
| ccxCZ | that's also an alternative | 00:22 |
| sproaty_ | on windows unfortunately :( | 00:23 |
| ccxCZ | well, then the trick with moving .bzr is more easilly done I guess | 00:24 |
| sproaty_ | cheers :) | 00:29 |
| michaelh1 | Sorry for the spam, but any Australians here going to UDS on Qantas tomorrow? | 09:26 |
| === michaelh1 is now known as michaelh1|away | ||
| hikiko | hello | 18:36 |
| hikiko | how can i get a previous revision of my launchpad tree? | 18:39 |
| hikiko | (revert to the previous) | 18:41 |
| jelmer | hikiko: bzr revert -rREV | 18:58 |
| jelmer | hikiko: if you also want to change the branch back, use "zr update -rREV" | 18:58 |
| hikiko | thank you :) | 18:59 |
| hikiko | hmmm it doesn't download anything | 18:59 |
| hikiko | i added some textures (png images) to my branch previous revision | 19:00 |
| hikiko | and now i want them back without checking out and then copy and then commit etc | 19:00 |
| hikiko | is this possible? | 19:00 |
| thumper | hikiko: it doesn't need to download anything as it has the local history | 19:01 |
| hikiko | no | 19:01 |
| thumper | (assuming you didn't use a light weight checkout) | 19:01 |
| hikiko | i replaced them | 19:01 |
| hikiko | with low resolution textures | 19:01 |
| hikiko | and now i want the previous high resolution | 19:02 |
| hikiko | from the previous release | 19:02 |
| fullermd | In that case you want to use 'revert' on those files. | 19:02 |
| hikiko | bzr revert file 1 file2 etc? | 19:04 |
| fullermd | revert -rWHATEVER file1 file2 ... | 19:05 |
| hikiko | thank you :) | 19:07 |
| mgz | hm, apparently it's midnight back home. | 23:09 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!