sivang | CosmoDad: hehe, well, in real life my name, but around the ubuntu websites, it's always the email :) | 12:05 |
---|---|---|
CosmoDad | ;) | 12:08 |
mpt | It's Launchpad, it infects things with awkward-terminology-disease | 12:10 |
mpt | hmm | 12:10 |
mpt | "bzr: ERROR: Local branch is not a newer version of remote branch." | 12:10 |
jamesh | something seems weird: https://chinstrap.ubuntu.com/~jamesh/pending-reviews/log | 12:18 |
jamesh | HistoryMissing: _Branch(u'/home/warthogs/archives/rocketfuel/launchpad/devel') is missing inventory {pqm@pqm.ubuntu.com-20051117235800-9dcf601f2e4bb0d3} | 12:18 |
mpt | jamesh, I think that's what lifeless was talking about 1h40m ago | 12:20 |
jamesh | looks like ddaa's evil takes-25-minutes-to-merge branch has been merged | 12:23 |
mpt | lifeless, sorry to bother you again, but do you know why I'd be getting the "Local branch is not a newer version of remote branch" error? | 12:48 |
mpt | Does bzr commit automatically push? | 12:48 |
jamesh | mpt: ssh over to chinstrap and run "bzr log | less" in the directory you are pushing to | 01:03 |
jamesh | see if that gives you some ideas | 01:03 |
jamesh | (and check to make sure you are pushing to where you think you are) | 01:04 |
=== SnakeBite_ [n=SnakeBit@212.25.63.37] has joined #launchpad | ||
mpt | jamesh, it contains nothing from me | 01:10 |
mpt | the most recent stuff in it is from November 10 | 01:11 |
jamesh | mpt: okay. Does the revision number for the latest log entry in the remote branch exist in your local branch, and have the same log message? | 01:12 |
jamesh | the remote branch needs to be a strict subset of the local branch for the push to succeed | 01:14 |
mpt | jamesh, no, they're different | 01:14 |
mpt | In the remote one, revno 2821 is Kinnison fixing a bug. In the local one, 2821 is me merging rocketfuel. | 01:15 |
jamesh | so how did you push to the remote branch last time? | 01:15 |
mpt | I haven't successfully yet | 01:16 |
=== etnoy [n=etnoy@227.236.216.81.vs.vf.siwnet.net] has joined #launchpad | ||
jamesh | where are you pushing to? | 01:17 |
mpt | /home/warthogs/mpt/launchpad/smallfixes | 01:17 |
jamesh | so how did /home/warthogs/mpt/launchpad/smallfixes get it's current content if you haven't been able to push to it? | 01:18 |
mpt | because lifeless successfully demoed a push on my machine | 01:18 |
mpt | iirc | 01:18 |
jamesh | you can either (a) push to a different location, or (b) use "bzr push --overwrite" to ignore any changes in the remote copy | 01:19 |
jamesh | if you do (b), make sure there isn't anything that needs to be kept in the remote branch. | 01:20 |
mpt | ok, thanks | 01:20 |
mpt | jamesh, the next problem is right up your alley, it's about gpg | 01:26 |
mpt | when I send to pqm, gnome-gpg crashes with 2 * "gpg: [stdout] : write error: Broken pipe", followed by "iobuf_flush failed on close: file write error" | 01:28 |
jamesh | no idea there, sorry | 01:28 |
jamesh | actually, is the "mail" program installed? | 01:30 |
mpt | ... no | 01:30 |
jamesh | sudo apt-get install mailx then | 01:30 |
mpt | hurrah, that works | 01:31 |
mpt | thanks jamesh | 01:31 |
=== mpt updates PQMSetup | ||
=== rbelem [n=rodrigo@ubuntu/member/rbelem] has joined #launchpad | ||
mdz | is it normal for a bzr pull to take 2 hours? | 02:25 |
jamesh | mdz: unfortunately yes. | 02:42 |
jamesh | mdz: I usually rsync the checked out rocketfuel tree, and use it to make local working copies or perform merges | 02:42 |
jamesh | http://blogs.gnome.org/view/jamesh/2005/11/17/0 <- this may also help. The default sftp transport in bzr doesn't do compression | 02:43 |
mdz | jamesh: thanks | 02:48 |
mdz | I don't suppose I should abort my ongoing pull to restart it with openssh-ftp though | 02:48 |
mdz | [============================ ] fetch revision 504/819 0:53:59 | 02:48 |
jblack | yeah, that first pull is quite expensive. If you keep a branches dir, you can update that pristine version when you like much more efficiently and branch that. | 03:13 |
Kinnison | g/night all | 04:02 |
mdz | jblack: this isn't my first; it's updating a branch I pulled down during UBZ | 04:12 |
=== robitaille [n=robitail@ubuntu/member/robitaille] has joined #launchpad | ||
=== jordi [n=jordi@115.Red-213-96-69.staticIP.rima-tde.net] has joined #launchpad | ||
=== sabdfl [n=mark@ubuntu/member/pdpc.silver.sabdfl] has joined #launchpad | ||
=== mdke_ is now known as mdke | ||
=== Seveas [n=seveas@ubuntu/member/seveas] has joined #launchpad | ||
=== Keybuk [n=scott@descent.netsplit.com] has joined #launchpad | ||
=== Seveas [n=seveas@ubuntu/member/seveas] has joined #launchpad | ||
=== heyko [n=heyko@tor/session/x-561a3e0733287324] has joined #launchpad | ||
=== JanC_spurt [n=janc@e185118.upc-e.chello.nl] has joined #launchpad | ||
=== jblack_ [i=jblack@static-209-158-45-74.scr.east.verizon.net] has joined #launchpad | ||
=== heyko [n=heyko@tor/session/x-18e6c46f6a5020cb] has joined #launchpad | ||
=== ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has joined #launchpad | ||
=== beluche [n=beluche@213.181.50.130] has joined #launchpad | ||
beluche | hi folks | 02:13 |
beluche | hello... | 02:19 |
=== heyko_ [n=heyko@tor/session/x-baa6ab66bfaf08cc] has joined #launchpad | ||
=== thierry [n=thierry@modemcable209.48-131-66.mc.videotron.ca] has joined #launchpad | ||
=== GoRoDeK [n=gorodek@p5083EA37.dip.t-dialin.net] has joined #launchpad | ||
=== Keybuk [n=scott@descent.netsplit.com] has joined #launchpad | ||
=== eruin [n=eruin@unaffiliated/eruin] has joined #launchpad | ||
=== gml_ is now known as gml | ||
=== lbm [n=lbm@x1-6-00-13-10-7a-d1-e4.k233.webspeed.dk] has joined #launchpad | ||
=== rockz [n=yuri@PW240.neoline.com.br] has joined #launchpad | ||
=== rockz [n=yuri@PW240.neoline.com.br] has left #launchpad ["Fui] | ||
=== WaterSevenUb [n=WaterSev@195-23-220-179.net.novis.pt] has joined #launchpad | ||
=== thierry [n=thierry@modemcable209.48-131-66.mc.videotron.ca] has joined #launchpad | ||
=== hannosch [i=hannosch@e176118230.adsl.alicedsl.de] has joined #launchpad | ||
=== etnoy [n=etnoy@227.236.216.81.vs.vf.siwnet.net] has joined #launchpad | ||
=== munzir [n=dripo@85.129.228.253] has joined #launchpad | ||
munzir | hi gurs! this is the first time I am here so let me first thank you for this great piece of software | 07:03 |
munzir | now I would like to know how rosetta compares to other tools like pootle or karoutche or ... | 07:04 |
=== zygis [n=zygis@clt-84-32-129-122.dtiltas.lt] has joined #launchpad | ||
=== heyko_ [i=tor@tor/session/x-10878209fc7b333a] has joined #launchpad | ||
munzir | Hi sirs! I would like to know how rosetta compares to other tools like pootle or kartouche or ...? which one should I choose and depending on what? | 07:11 |
sivang | munzir: personally, I think Rosetta is more comfortable to use then Pootle (Not familiar with kartouch). BUt that's probably a matter of taste. | 07:15 |
munzir | sivang: ok I respect your taste since I have tried none to this minute. | 07:20 |
sivang | munzir: ah :) | 07:20 |
munzir | sivang: now from where do rosetta get the translations and how do they coordinate it with people translating directly upstream?! | 07:21 |
munzir | say I want to translate drupal now to my language which is Arabic what shall I do? | 07:23 |
sivang | munzir: let's see | 07:32 |
sivang | munzir: https://wiki.ubuntu.com/RosettaFAQ | 07:34 |
sivang | munzir: let me know if this helps :) | 07:34 |
sivang | munzir: also, https://launchpad.net/products/drupal/+translations | 07:35 |
=== jblack_ is now known as jblack | ||
sivang | munzir: regarding cordinations with upstream, all the translations availabel through rosetta can be xported and reused by uptream people | 07:52 |
=== dand [n=dand@86.105.65.80] has joined #launchpad | ||
=== munzir [n=dripo@85.129.218.73] has joined #launchpad | ||
=== hannosch [i=hannosch@e176118230.adsl.alicedsl.de] has left #launchpad [] | ||
=== gml_ [i=gml@dyn-83-156-14-98.ppp.tiscali.fr] has joined #launchpad | ||
=== gml_ is now known as gml | ||
=== gml_ [i=gml@dyn-83-156-14-142.ppp.tiscali.fr] has joined #launchpad | ||
=== gml_ is now known as gml | ||
=== mpt [n=mpt@tvwna-ip-a-1.princeton.org] has joined #launchpad | ||
=== azhax_ [n=myazhax@wrsrl.ncl.ac.uk] has joined #launchpad | ||
=== azhax_ is now known as myazhax | ||
=== Blejdfizt [n=foobar@c-d74472d5.024-2014-67626714.cust.bredbandsbolaget.se] has joined #launchpad | ||
=== ddaa [n=ddaa@ordo.xlii.org] has joined #launchpad | ||
=== poningru [n=poningru@n128-227-11-184.xlate.ufl.edu] has joined #launchpad | ||
=== mdz [n=mdz@ca-studio-bsr1o-251.vnnyca.adelphia.net] has joined #launchpad | ||
=== mdz [n=mdz@ca-studio-bsr1o-251.vnnyca.adelphia.net] has joined #launchpad | ||
=== dewd [n=dewd@201009186135.user.veloxzone.com.br] has joined #launchpad |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!