| MeaCulpa | How can I bzr add a file deep in a directory while leaving that whole dir tree not versioned? | 01:33 |
|---|---|---|
| bob2 | well, you'd obviously have to version the dirs, but you don't have to add everything in them | 01:35 |
| MeaCulpa | bob2: I haven't control of the ext file name pattern, say there are 100 different kinds of files, I only want 1 file under control | 01:36 |
| MeaCulpa | I don't want to regex match all the other files, I want no bzrignore involvement | 01:37 |
| bob2 | ? | 01:37 |
| bob2 | bzr add -N who/cares/blah.txt | 01:37 |
| bob2 | bzr add --dry-run -N who/cares/blah.txt | 01:37 |
| MeaCulpa | no, this will still add the dir, who | 01:37 |
| bob2 | of course | 01:37 |
| MeaCulpa | and all it's files | 01:37 |
| bob2 | it won't add all the things in who/, though | 01:37 |
| bob2 | doesn't for me | 01:38 |
| MeaCulpa | hmm oh, I got it | 01:39 |
| MeaCulpa | after I add this I ran bzr stat, and I didn't noticed that it listed all the IGNORED file :) | 01:39 |
| MeaCulpa | bob2: Thank you | 01:41 |
| tigrang | whats the equivalent of git reset --hard HEAD~1 | 07:56 |
| vila | tigrang: I don't know git ;) But that's probably 'bzr revert' | 07:58 |
| tigrang | vila: when I do that and look at bzr log, there's still the latest commit, is that normal, how do I know which revision I'm currently on | 07:59 |
| vila | bzr revno | 08:00 |
| vila | bzr revert brings you back to the latest committed revision indeed, if you want a different one, use 'bzr revert -r<rev spec>' | 08:00 |
| fullermd | Mmm. reset screws with the branch. --hard makes it screw with the WT files and meta. | 08:23 |
| fullermd | So the equivalent would probably be more like a pull --overwrite. | 08:24 |
| fullermd | --soft is more closely related to uncommit. The rest of the --options get more esoteric in WT-vs-index stuff, so probably don't have particularly close equivalents. | 08:27 |
| maxb | For the specific case of tigrang's command I guess it would be 'bzr pull --overwrite -r -2 .' | 08:50 |
| maxb | Or 'bzr uncommit --force && bzr revert' to arrive at the same position via another path | 08:51 |
| === jam1 is now known as jam | ||
| nopf | hm the web is not conclusive... what is the best quick way to remove some accidentally commited large files from the repo completely? | 14:01 |
| jelmer | nopf: create a new repository, clone all history except the history with the acidentally commited files into it | 14:04 |
| nopf | jelmer: well thanks, first. shall i use 'bzr clone', which is deprcated? and if so (or 'branch'), how do i 'keep out' the files? do i have to redo the other changes in the commit where they went in? (added some smaller files in the same commit...) | 14:07 |
| karlis | I ask because I'm relatively new to Linux and I don't know exactly what to search for. When someone commits something to our server its drwxr-xr-x user:user. But i need it to be drwxrwxr-x root:developers. Where to set this or what do I search for?. | 14:08 |
| LeoNerd | Personally I'd branch at the commit that added the file, uncommit, remove the file, recommit, then replay over the rest of the commits. If there's any that try to modify it they'll conflict, so you'll just have to ignore that change and continue | 14:09 |
| nopf | LeoNerd: oki. this seems like a bit of work but managable. i'll try | 14:10 |
| === cloudnar is now known as idnaria | ||
| === SamB_ is now known as SamB | ||
| kolbe | i'm trying "bzr branch 5.5 5.5.29 -r 3654" and it shows me "- Fetching revisions:Get stream source" and hangs ... any pointers? | 23:39 |
| kolbe | looks like 5.5.29 is actually growing in size, so i guess it's doing something... but what? can it do this branch locally, or is it trying to do something over the network? | 23:40 |
| kolbe | maybe i want bzr export anway | 23:43 |
| jelmer | kolbe: what's your question? | 23:45 |
| kolbe | when i do "bzr branch 5.5 5.5.29 -r 3654" it appears to hang with "- Fetching revisions:Get stream source", is that normal? | 23:45 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!