| === tommieb is now known as t0mm13b | ||
| Jordan_U | How do I change a previous commit then rebase all of the following commits on top of that change? | 04:18 |
|---|---|---|
| RAOF | Jordan_U: I've never actually tried that, but I'd guess the "bzr-rebase" plugin would be a prerequisite. Have you checked its documentation? | 04:28 |
| Jordan_U | RAOF: Yes, that was the first place I looked but the only way I can find to do it is to purposefully introduce a conflict for that commit, which is kind of ugly | 04:40 |
| lifeless | statik: stalking me ? :) | 05:12 |
| Peng | vila: ping | 08:36 |
| Peng | vila: Well... Trying out suppress_warnings on an old dirstate-tags standalone branch, accessing it over http (with CGI hpss enabled) or bzr+http, I still get one deprecation warning server-side. It used to be two, but it should be zero, no? | 08:42 |
| Peng | vila: (I put suppress_warnings in branch.conf, FYI.) | 08:42 |
| Peng | vila: No warnings server-side with bzr+ssh, though. :D | 08:43 |
| vila | Peng: I'm not there :-) | 09:38 |
| vila | Peng: Nevertheless, warning suppression most certainly need to be set server-side too | 09:38 |
| Peng | vila: I only set it server-side. | 09:39 |
| vila | Peng: But file bugs or comment on the existing one (can't remember which handy) | 09:39 |
| Peng | vila: OK. | 09:39 |
| Peng | I dunno, I like asking about things on IRC first for some reason. :) | 09:39 |
| vila | Peng: that's not unreasonable :-) | 09:40 |
| Peng | vila: The existing bug is bug #497694, FYI. :) | 09:43 |
| ubottu | Launchpad bug 497694 in bzr "missing features about format deprecation" [Medium,Confirmed] https://launchpad.net/bugs/497694 | 09:43 |
| vila | Peng: right, can't remember who filed it though :-D | 09:47 |
| * vila goes back fixing the kitchen | 09:48 | |
| ruki | i did : bzr push lp:~userid/project-name/branch-name but i am getting this error: bzr: ERROR: Not a branch: "/home/user/" | 09:51 |
| bob2 | run it in the branch you want to push | 09:51 |
| bob2 | int in ~/ | 09:51 |
| bob2 | er 'not in ~/' | 09:51 |
| Peng | vila: Well, I filed bug #498739. :) | 09:52 |
| ubottu | Launchpad bug 498739 in bzr "Fails to completely suppress server-side format deprecation warning over bzr+http" [Undecided,New] https://launchpad.net/bugs/498739 | 09:52 |
| ruki | bob2: i am sorry but i couldnt understand you! | 09:53 |
| Peng | ruki: Your home directory is apparently not a branch. | 10:02 |
| Peng | ruki: cd to the directory of the branch you want to push. | 10:03 |
| ruki | Peng: ok. | 10:03 |
| ruki | Peng: have a look at this: http://pastebin.com/d32e9a28a | 10:10 |
| Peng | Oh crap. | 10:13 |
| Peng | ruki: Um. Try pushing again. | 10:13 |
| Peng | That's a really trivial problem, but there isn't a nice button to press to fix it. Pushing again will probably work, though. | 10:14 |
| Peng | ruki: Hold on a second. What's the exact format of the upstream project? | 10:16 |
| Peng | ruki: Err, never mind, the error message included enough information. Your local repository is using a form that is not backwards-compatible with the upstream project. Even once you're able to push the branch to Launchpad, nobody will be able to merge it without upgrading their branches. | 10:18 |
| lifeless | lol | 10:22 |
| Peng | :( | 10:27 |
| AnAnt | Hello, how can I change the default push/pull targets ? | 11:52 |
| AnAnt | branches that is | 11:52 |
| bob2 | --remember | 11:55 |
| bob2 | or hack .bzr/branch/branch.conf | 11:55 |
| AnAnt | bob2: thanks | 11:57 |
| _Andrew | Do you always have to make a commit when you merge branches? | 13:08 |
| _Andrew | nevermind, the documentation answers all | 13:21 |
| === froosch_ is now known as froosch | ||
| NET||abuse | ooh, ubuntu packaged up bzr 2.0.3 today :) | 14:06 |
| NET||abuse | what cool fun updates should i expect? | 14:06 |
| === AnMaster_ is now known as AnMaster | ||
| gour | does bzr-git enable one to work with bzr locally and commit to github-based project? | 14:08 |
| jelmer_ | gour: yes | 14:15 |
| gour | jelmer_: that's great to hear. thanks | 14:16 |
| ronny | gour: s/commit/pull and push/ | 14:20 |
| gour | ronny: cool. how is pida? | 14:21 |
| ronny | gour: moving slowly, started to get rid of some weird deps | 14:22 |
| gour | ronny: you're using hg more than bzr? | 14:23 |
| ronny | yup | 14:26 |
| === khmarbaise_ is now known as khmarbaise | ||
| thrope | trying to use bzr-svn -... got the following error bzr: ERROR: subvertpy.SubversionException: ('Svndiff contains a too-large window', 185001) | 18:16 |
| jelmer_ | thrope: you need a newer version of subvertpy | 18:20 |
| thrope | ah ok... it is a big commit. I'm using macports so i'm not sure how easy it is to upgrade but i'll try to get the newer | 18:20 |
| thrope | thanks | 18:20 |
| thrope | jelmer_: great that seemed to work | 18:31 |
| gour | thrope: i'm trying to dpush my local commit to github but get "bzr: ERROR: The remote server unexpectedly closed the connection". any idea? | 18:34 |
| gour | jelmer_: ^^^ | 18:34 |
| gour | thrope: excuse me...wrong nick :-( | 18:34 |
| jelmer_ | gour, what url are you pushing to? | 18:56 |
| gour | jelmer_: | 18:56 |
| gour | git@github.com:gour/django-mingus.git | 18:56 |
| jelmer_ | gour: you need to use a URL | 18:57 |
| jelmer_ | gour: e.g. git+ssh://git@github.com/gour/django-mingus.git | 18:57 |
| gour | jelmer_: this was better, but resulted in http://dpaste.com/135863/ i+ve to go afk. bbs | 18:59 |
| gour | jelmer_: any idea what's wrong? | 19:26 |
| haruspexed | hi how to export revision number of bazaar into a file with every commit? like into 1st line of css file | 20:06 |
| gour | jelmer_: now i see that the commit is published on githuh, but still wonder about the crash | 20:06 |
| lifeless | statik: hi | 21:17 |
| === khmarbaise____ is now known as khmarbaise | ||
| igc | morning | 22:00 |
| poolie | hi all | 22:30 |
| Peng | Good morning. :) | 22:33 |
| lifeless | poolie: hi poolie | 22:38 |
| poolie | hi | 22:41 |
| poolie | lifeless: did you get my pm? | 22:43 |
| lifeless | ah yes | 22:44 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!