| === BasicMBP is now known as BasicOSX | ||
| === Guest46318 is now known as wallyworld | ||
| === mark06 is now known as mark06_away | ||
| === mark06_away is now known as mark06 | ||
| mark06 | is there any command to revert back to previous commit, but instead of removing the current commit, add another for reverting it? | 10:18 |
|---|---|---|
| Peng | like hg backout? Um. Not sure. | 10:19 |
| mark06 | e.g. 1=x, 2=y, 3=undo y --> so bzr diff -r 1..3 is empty | 10:20 |
| mark06 | I want to undo a commit but keep it saved somehow... I'm not like branching and marking as abandoned in launchpad... | 10:21 |
| mark06 | hmm maybe that's better | 10:21 |
| Peng | right, like hg backout. I'm scratching my head but I don't remember if bzr has a specific command for it. You can use a 'bzr merge' incantation to make the changes to your working copy, and then commit it. | 10:22 |
| Peng | There's probably information available online. | 10:23 |
| jelmer | Peng, mark06: yeah, you can do a "reverse merge" and then commit that | 10:23 |
| jelmer | bzr merge -r4..3 && bzr commit -m "Revert commit 4." | 10:24 |
| mark06 | cool | 10:36 |
| mark06 | thanks all | 11:21 |
| mark06 | is there an easy way to convert a bzr+ssh url to http? | 11:50 |
| mark06 | just replacing the protocol isn't always enough | 11:50 |
| mark06 | or maybe a way to make bzr use the http url for the given ssh one? | 11:51 |
| fullermd | In general? No chance, you have no idea how the server is setup. | 11:54 |
| mark06 | so bzr+ssh urls can be really arbitrary? | 11:59 |
| fullermd | Well, they're (theoretically/virtually, anyway) filesystem paths on the server. HTTP requests often, but nowhere near always are, and the HTTP root is almost certainly totally different from the root you get via ssh. | 12:01 |
| mark06 | launchpad support would be enough... anyway I'm just writing a manual conversion now | 12:01 |
| fullermd | LP would be an easy case. | 12:02 |
| mark06 | from the samples I have here, it's basically s/bzr+ssh/http, and s/ 'launchpad.net/+branch/project' / 'launchpad.net/~<owner>/project/trunk', is that it? | 12:05 |
| fullermd | Something like that. | 12:06 |
| fullermd | All the paths are virtual, and defined by LP's particular rules, so they all follow the same pattern on both methods, whatever it is. | 12:06 |
| mark06 | hmm, it's problematic since how can we know branch owner? | 12:06 |
| mark06 | no they don't follow the same method.... just replacing protocol fails for '+branch' urls.... but it's just ok if ~user/project/branch format is used instead | 12:07 |
| mark06 | I mean '+branch' fails under http | 12:07 |
| fullermd | Mm. I've never tried going that way around. | 12:08 |
| fullermd | s/http/bzr+ssh/ works fine though. | 12:09 |
| mark06 | hmm http://launchpad.net/project works, good... except for an inconvenient message at the bottom, e.g. http://launchpad.net/moin-solenoid/ is permanently redirected to https+urllib://launchpad.net/moin-solenoid/ | 12:09 |
| mark06 | hmm not ideal but 2> /dev/null | 12:10 |
| mark06 | hmm https:// doesn't show that... | 12:11 |
| mark06 | any reason to always use https over http? | 12:11 |
| mark06 | is lp:foo called an url? | 12:12 |
| fullermd | More directory lookup, maybe. | 12:14 |
| mark06 | hmm "location" | 12:14 |
| Peng | it's a syntactically valid URI, whatever we call it | 12:15 |
| === mark06 is now known as mark06_away | ||
| === mark06_away is now known as mark06 | ||
| mark06 | http://bazaar.launchpad.net/~renatosilva/+junk/scripts/revision/224 :) | 12:41 |
| mark06 | http://i.imgur.com/hwnjZlt.png | 12:43 |
| qquark | hi guys! Can someone help me with a problem I have after migrating from GIT repository to Bazaar? My problem is that bzr repo is 3x times larger than GIT - or 2.24 x time if I use "bzr pack --clean-obsolete-packs" | 14:06 |
| qquark | My questions are: Why is it so big? How can I see which objects create this large size? | 14:07 |
| mark06 | does the size change if you branch from it? | 14:24 |
| qquark | yes | 14:29 |
| mark06 | what rate | 14:30 |
| qquark | its still very big: 5.2 GB instead of 1.4 GB | 14:30 |
| qquark | the repo size in git is about 4.1 GB | 14:30 |
| qquark | and in bzr is 12 GB. And after I do: bzr pack --clean-obsolete-packs, it becomes 9.4 | 14:31 |
| qquark | So, the trunk in git: 1.4 GB and bzr branch of trunk: 5.2 GB | 14:32 |
| === mark06 is now known as mark06_away | ||
| fullermd | My impression has been that a factor of two difference is a ways out on the bell curve, but not totally shocking. A factor of almost 4, though, that's a lot of sigma... | 14:57 |
| === mark06_away is now known as mark06 | ||
| === r0bby_ is now known as robbyoconnor | ||
| === who_da_fly is now known as superfly | ||
| `nik` | how do i configure bzr to show me colored diffs? | 23:23 |
| `nik` | there seems to be a bug in the docs. this section (http://doc.bazaar.canonical.com/bzr.2.6/en/user-guide/configuring_bazaar.html#looking-at-the-active-configuration) links me to this page (http://doc.bazaar.canonical.com/bzr.2.6/en/user-reference/index.html#configuration-settings) but the configuration-settings anchor doesn't exist. it should link to here: http://doc.bazaar.canonical.com/bzr.2.6/en/user-reference/configuration-help.html | 23:26 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
