/srv/irclogs.ubuntu.com/2007/09/26/#bzr.txt

=== AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr
=== BasicOSX [n=BasicOSX@216-243-162-1.static.iphouse.net] has joined #bzr
=== herzel [i=herzel@gateway/tor/x-c1976f286381567c] has left #bzr []
=== abentley [n=abentley@bas8-toronto63-1088754407.dsl.bell.ca] has joined #bzr
=== herzel [i=herzel@gateway/tor/x-b1ecb12d9a932322] has joined #bzr
=== edalytical [n=eddie@student5584.student.nau.edu] has joined #bzr
lifelesspoolie_: ping12:55
=== offray_ [n=offray@69.79.144.212] has joined #bzr
offray_Hi all01:01
offray_I'm trying to use svn2bzr to convert a svn project to bazaar but I get two errors related with bzrlib: "ImportError: No module named bzrlib.branch" or "ImportError: No module named clone". I don't know how to deal with it. May be my version of bzrlib is not syncronized with svn2bzr, but I don't know which version is supposed to be. Any pointer to a solution?01:03
AfCoffray_: I believe that the plugin called 'bzr-svn' is the solution recommended by the Bazaar hackers; you might try that01:06
coryIs there any variant on commit that doesn't actually touch the working tree?01:08
coryEr, revert.01:08
poolie_lifeless, hi01:08
=== BasicOSX [n=BasicOSX@216-243-162-1.static.iphouse.net] has joined #bzr
Odd_Blokecory: Look at 'uncommit'.01:10
offray_AfC: Thanks. I will try, but it says that you can put bzr code in svn, but not convert from svn to bazaar. I will read mode01:11
coryOdd_Bloke: I spoke poorly.  For instance, the working tree might know that I have moved a => b.  I want it to forget that so that I can, say, add b and remove a instead.01:12
coryadd b and remove a, that would be.  Maybe I should stop talking. :P01:12
coryI don't want to do anything with already committed revisions, like uncommit does.01:13
Odd_Blokecory: Why doesn't revert do what you want?01:13
=== dewd_ [n=dewd@201009147182.user.veloxzone.com.br] has joined #bzr
offray_umm... there is a svn-import wich seems to make the same that svn2bzr01:13
coryBecause revert will move the file back.01:13
coryI happen to need it to not do that.01:13
poolie_cory, do you mean revert --keep?01:14
poolie_i mean, remove --keep01:14
coryI think revert --keep is what I want. ;)01:14
=== jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr
poolie_cory, you could file a bug asking for that01:15
=== cory nods. Just wanted to make sure there wasn't something obvious I was missing.
fullermdWouldn't rm/add do that?01:16
coryOr even unexposed api that I could use.01:16
coryOnly if there's a bzr add --even-if-it-doesn't-exist01:16
fullermdHuh?01:17
fullermdWhy would you want to add a file that didn't exist (and what would that even mean?)?01:17
coryI want it to forget that I told it to move it, not to add it!01:17
coryThis is me fighting with perforce, really.01:18
poolie_cory, so in this particular case01:18
poolie_why not just do a reverse mv01:18
fullermdOK, you're losing me...  I thought you had the case "moved a to b", and wanted to change that to the case "rm'd a and added b".01:18
lifelesspoolie_: what time should I pop over ?01:18
poolie_any time01:19
lifelessok01:19
poolie_are you trying to call?01:19
lifelessI'll head over shortly01:19
poolie_i can't hear anything when i pick up01:19
poolie_do you want to meet spivvo on the way?01:19
lifelessI did try01:19
lifelessit went to your voice mail both times01:20
lifelesstry ringing yourself perhaps. Is the spivster up ?01:20
lifelesscory: there is a bzrlib api to add a file regardless of physical presence01:20
lifelesscory: tree.add([paths] , [ids] , [kinds] )01:21
lifelessspiv: I'll be on the 10:30 from hornsby again01:22
coryOh, I have another issue...the smart server seems to like leaving locks around. :/01:23
=== igc [n=igc@ppp121-45-227-231.lns1.bne4.internode.on.net] has joined #bzr
igcmorning all01:25
poolie_cory, if you abort the operation, or even when it succeeds?01:27
poolie_igc, hi01:27
igchi poolie_01:27
corypoolie_: From aborted operations, yes.  I expected the server instance would clean up after itself after it loses its connection.01:27
coryRunning it through inetd...maybe it's terminated before it gets the chance.01:29
lifelessbbiab01:31
AfCcory: any reason you chose not to run it as a daemon full time?01:32
coryAfC: No special reason.01:32
AfCcory: (but I note that bzr+ssh := run a `bzr --serve` for one time use and seems to manage to last long enough to clean up after itself)01:33
=== cypherbios [n=cyr@ubuntu/member/cypherbios] has joined #bzr
=== Demitar_ [n=demitar@c-212-031-182-147.cust.broadway.se] has joined #bzr
=== offray_ [n=offray@69.79.144.212] has left #bzr []
=== elmo [n=james@83-216-156-21.jamest747.adsl.metronet.co.uk] has joined #bzr
=== mw is now known as mw|out
=== rml [n=Skippy@78.32.35.169] has joined #bzr
coryDoh, I'm getting sigpiped.01:55
fullermdMmm.  Could be a diff.  bzr+ssh probably gets sighup.01:55
poolie_cory, there's a recent bug discussing how to do that better02:10
ubotuNew bug: #145027 in bzr "bad assertions in WorkingTree4._add" [Medium,Confirmed]  https://launchpad.net/bugs/14502702:46
=== pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr
AfCAs at which version did --trees become the default implied behaviour in `bzr init-repo` (ie, can I remove --trees from my instructions now?)02:52
fullermd0.15, I think02:52
fullermdAnybody keeping up should be long past that, but there're probably still a notable percentage of people below it.02:53
AfCfullermd: oh, that's ok02:58
AfCfullermd: I actively encourage my users to be >= 0.9002:58
AfCfullermd: I was just worried it was 0.18 or something, in which case I would have left the documentation alone02:59
AfCfullermd: thanks02:59
fullermdI think I actually have a server with 0.14...02:59
fullermdBut that's 'cuz everything on it is outdated, and I'm just waiting to do it all in one swell foop, so not bothering to piecemeal.02:59
AfCWhat about --dirstate-tags ? Is it default as of 0.90?03:00
fullermd0.91, I think.03:00
AfCfullermd: shit03:00
AfCok03:00
PengHow does one switch a repo between --trees and --no-trees?03:05
=== Peng wanders off.
fullermdrm or touch still, I think.03:07
fullermd.bzr/repository/no-working-trees03:07
coryOr checkout / remove-tree?03:08
coryrepo / branch...never mind.03:08
=== poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr
ubotuNew bug: #145033 in bzr "need a command to switch a repository between trees and no-trees" [Medium,Triaged]  https://launchpad.net/bugs/14503303:20
lifelessfullermd: a patch to reconfigure to do it would be good03:22
fullermdWould be the reasonable place for it.03:23
poolieor maybe we should have gdb-like set/show commands03:24
=== rml [n=Skippy@78.32.35.169] has joined #bzr
fullermdWow, we're over half a million bugs in launchpad?  ;)03:26
cory564043 isn't found...03:28
lifelessfullermd: no, 145K03:30
lifelessor perhaps I'm on crack03:30
igctoday's plan: review things (particularly from lifeless and poolie), then start on OSDC tutorial03:31
igcknit repo formats tidyups will be first03:31
fullermdlifeless: I'm aware.  Hence the ;) for poolie's x-ref.03:35
=== NamNguyen [n=namnt@203.162.163.50] has joined #bzr
lifelessigc: thanks03:44
igcnp03:45
lifelessigc: I'm working on applying inventory deltas to the parent tree of a working tree03:45
=== jelmer_ [i=jelmer@12.196.220.245] has joined #bzr
=== jelmer__ [i=jelmer@12.196.220.245] has joined #bzr
=== lifeless waits for jelmer________________________________________
=== jelmer__ blames AT&T
jelmer__sucky airport wireless04:03
=== jelmer__ is now known as jelmer_
=== edalytical_ [n=eddie@student5584.student.nau.edu] has joined #bzr
=== edalytical_ [n=eddie@student5584.student.nau.edu] has left #bzr []
schierbeckjelmer_: is there some historical reason why the viz window is titled "bzrk"?04:15
jelmer_schierbeck: yup, it used to be a standalone plugin called 'bzrk'04:16
jelmer_or 'bezerk' (if I got hte spelling right)04:17
schierbeckjelmer_: do you think it should be changed to something more descriptive?04:17
schierbecklike "branch history"04:17
AfCAgreed04:17
jelmer_schierbeck: yeah, that's probably a good idea04:19
schierbeckjelmer_: i'll make a branch for it04:20
jelmer_cool, thanks (-:04:20
schierbeck"branch history" is fine, right?04:21
lifelesssounds good04:25
lifelessor graphical log of URL04:25
lifelesssorry, "Log of <URL>"04:25
lifeless(because viz is a graphical log)04:25
=== orospakr [n=orospakr@bas4-ottawa23-1088826643.dsl.bell.ca] has joined #bzr
schierbecklifeless: i'm not really fond of "log"04:34
schierbeckit struck me when i saw it in olive04:34
schierbeck"history" much better captures the purpose04:34
schierbeckperhaps it's just me04:35
schierbeckit usually is04:35
abentleyI always find "unprintable" exceptions amusing, because "unprintable" was used in place of swear words in the Foundation series.04:41
poolie:)04:42
=== igc food
lifelessschierbeck: on the other hand, 'bzr log' is the text command to get the same data05:07
lifelessschierbeck: I don't have a strong opinion though; mainly showing the url would be nice.05:07
schierbecklifeless: why not show the branch nick? isn't that more descriptive?05:10
fullermdWhy not just "bzr viz: $URL"05:12
schierbeckfullermd: i'd like it to be more human-readable05:13
schierbeckremember, it could be launched from nautilus05:13
schierbeckthe user may not even know of the "viz" shorthand05:14
abentleyschierbeck: The historical reason was that it was based on "gitk".05:15
schierbeckabentley: ok05:15
schierbeckbut the users won't really care about that05:15
schierbecki'm trying to find ways to streamline the viz, to make it less confusing to newcomers05:17
=== herzel [i=herzel@gateway/tor/x-49a867d0d0d4e979] has joined #bzr
=== jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr
abentleylol, looks like the git crew stole bzrk back, and made gitview.05:36
=== tchan [n=tchan@lunar-linux/developer/tchan] has joined #bzr
igcnow reviewing poolie's patch re safe_revision_id, etc.06:18
spivabentley: did you see my post about reconcile where a file parent is a ghost?06:20
abentleyYeah.06:20
Odd_BlokeI've created a separate branch for a particular release of my project.  However, I now have a bug-fix branch which I need to apply to both branches without its application to the release branch also merging the features that have been added since the release branch was branched from trunk.  What's the best way to go about doing this?06:21
abentleyI guess I have a preference for sticking to the known facts.06:21
abentleyThe ancestry data in your knits should be derivable from the texts of the revisions and the texts of the inventories.06:22
spivSo I guess one issue is if we remove the parent the ghost is later filled in and it turns out that the data wasn't wrong after all, then reconcile will be introducing problems rather than fixing them.06:22
abentleyBut really, I'd rather sleep on it.06:22
spivs/the ghost/and the ghost/06:22
spivFair enough.06:22
abentleyWhat problems?06:22
spivThat's why I wanted to check you'd seen then mail, so you had plenty of time to think about it :)06:23
spivWell, just that the data is now "wrong", whereas if we'd never run reconcile in that case it wouldn't be.06:23
fullermdOdd_Bloke: DAGgy it back to the branch point.06:24
Odd_Blokefullermd: DAGgy?06:25
fullermdThat's the term the mtn guys use for it.  Catchy.06:26
fullermdThe theory in extremis is that you make the bug fix revision a child of the revision that introduced the bug; that way any branch that has that bug, can directly merge the bug fix.06:26
fullermdIn less extreme cases like this, just making it a child of some rev both branches have in common (the branch point being the obvious choice).06:26
Odd_Blokefullermd: OK, thanks. :)06:29
fullermdOdd_Bloke: http://www.venge.net/mtn-wiki/DaggyFixes06:29
abentleyspiv: My point is having knit data with too few ancestors doesn't produce many harmful results, while having knit data with too many ancestors does.06:39
=== ..[topic/#bzr:poolie] : The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.91 is out - http://bazaar-vcs.org/Download | Please complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d
fullermdOoh.  Purdy.07:09
lifelessabentley: possibly gitview went via hg ?07:09
igcyah for the 0.91 release!07:09
lifelessabentley: it does produce harmful results - bzr log FILENAME dpeends on the index07:10
lifelessAIUI07:10
lifelessabentley: the harm in having ancestors that aren't validated, at the border to a ghost, is two fold- index, and text construction.  Making a fulltext there addresses the text construction hole07:11
abentleyThe gitk man page says that gitview is derived from bzrk.  Of course, it could be wrong.07:11
lifelessoh cool07:11
lifelesswhat version of gitk do you have ?07:12
abentleyI was just looking at this page: http://www.kernel.org/pub/software/scm/git/docs/gitk.html07:12
lifelessah07:14
lifelessUbuntu would appear to be out of date, and networkmanager blows again07:14
=== Kinnison [n=dsilvers@spoo.flarn.net] has joined #bzr
PengOh, 0.91 is out!08:01
PengCool.08:03
=== Peng wanders off.
=== pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr
=== zyga [n=zyga@ubuntu/member/zyga] has joined #bzr
=== BasicOSX [n=BasicOSX@216.243.156.81] has joined #bzr
lifelessbbiab08:21
=== hdima [n=hdima@idealer.cust.smartspb.net] has joined #bzr
=== Slant_Laptop [n=scott@66-233-139-237.lew.clearwire-dns.net] has joined #bzr
=== AnMaster [n=AnMaster@unaffiliated/anmaster] has joined #bzr
=== Lo-lan-do [n=roland@mirexpress.internal.placard.fr.eu.org] has joined #bzr
=== AfC seems to remember showing lifeless the gitview sources in a deli in Railway Square one morning and you saying "ah ha", "they copied that from us", and "yes we have that its called bzr viz"
=== pmezard [n=pmezard@dhcp26-226.enst.fr] has joined #bzr
fullermdY'know, there are some people who don't pass around source code in delis   :p09:19
fullermd(granted, they're people who live sad, colorless, wasted little lives.  But still.)09:20
lifelessAfC: sounds familiar09:22
=== matkor [n=matkor@85.14.91.175] has joined #bzr
AfC(sounds to me like the perfect opportunity for some propaganda on the bzr-gtk page)09:23
=== mvo [n=egon@p54A67B72.dip.t-dialin.net] has joined #bzr
=== Slant_Laptop [n=scott@70.110.37.247] has joined #bzr
AfCAm I correct in believing that `bzr serve` doesn't background itself?09:31
=== pbor [n=urk@host113-46-dynamic.58-82-r.retail.telecomitalia.it] has joined #bzr
fullermdI think you are...   though I've not tried, so for what that's worth...09:32
Odd_BlokeAfC: Just running it here doesn't background it...09:33
AfC[I mean, you run it on the command line and it sits there in foreground, implying I need to use the otherwise frowned upon --background option to start-stop-daemon (which, itself, I frown on, but I was being a good sys admin and being lazy)09:33
AfCOdd_Bloke: yeah09:33
AfCWell then. `bzr branch http://...` takes 20m36s minutes, bzr branch bzr://...` takes 1m46s. Guess I'll run the server daemon full time now09:43
=== AfC never did figure out how to get the transparent http redirect to bzr server working
=== mrevell [n=matthew@canonical/launchpad/mrevell] has joined #bzr
=== fog [n=fog@debian/developer/fog] has joined #bzr
AfCCanonical staff: someone should put an expires header on http://bazaar-vcs.org/LogoOptions?action=AttachFile&do=get&target=Bazaar+Logo+2006-07-27.png ... its a bit ridiculous that you download it every page load09:57
AfC(of course, that's a stupid way to serve static files, but anyway)09:58
=== poolie__ [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr
=== thumper [n=tim@125-236-193-95.adsl.xtra.co.nz] has joined #bzr
mwhAfC: yay moin10:00
AfC(If there _is_ a static file I can point at, I would be happy to)10:00
=== poolie_ [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr
=== AfC is really enjoying watching the Bazaar logo load again and again and again!
mwhlifeless: wow, 'diff' seems slow with packs10:15
mwhhttp://rafb.net/p/EVQLD158.html10:16
lapthrickjelmer: there doesn't seem to be any bugreport of that push -> diverged branches bug, and it's hitting me atm10:18
lapthrickjelmer: are you aware of / working on it?10:18
poolie_AfC: what's happening?10:20
AfCpoolie_ do a10:20
AfCwget -S 'http://bazaar-vcs.org/LogoOptions?action=AttachFile&do=get&target=Bazaar+Logo+2006-07-27.png'10:21
AfCand note the lack of expires headers10:21
AfC(compare10:22
AfC wget -S 'http://www.operationaldynamics.com/images/logo/logo-130x167.jpg'10:22
AfC)10:22
AfCpoolie_: result is that each time I reload my blog as I'm authoring I wait a few seconds for the Bazaar logo image I've used to load.10:22
AfC... that has knock on effect when aggregated on places like planet.*10:23
=== Lo-lan-do suggests using HEAD rather than wget -S
AfC(knock on load for you guys, that is)10:23
AfCLo-lan-do: --spider would have worked too10:23
AfCLo-lan-do: but HEAD is lwp and it does funny things sometimes10:24
AfCWhatever. The point is to see the headers10:24
AfCpoolie_ a .htaccess would probably kludge-fix it if you don't have easy access to the virtual host config10:25
AfCpoolie_ I can whip up the directives if they're not coming to mind easily10:25
=== GaryvdM [n=chatzill@dsl-241-254-221.telkomadsl.co.za] has joined #bzr
=== Gacha [n=gacha@81.198.204.153] has joined #bzr
Gachahi10:27
Gachacan somebody explain me the difference of --trees and --no-trees10:27
GachaI'm reading the docs, but I dont get it :)10:27
AfCA branch doesn't have to have its files (a "checkout", if you will) present10:27
AfCGacha: For instance,10:28
Gachain whitch case?10:28
AfCGacha: http://research.operationaldynamics.com/bzr/java-gnome/mainline/ is a branch called 'mainline' in a repository in directory /bzr/java-gnome on that server, whereas10:28
AfCwhich has --trees10:29
AfC... in other words, files are there10:29
lapthrickGacha: in a case you never need those file because you're only serving a branch, like launchpad does10:29
AfCwhereas10:29
lapthricks/a/the/10:29
AfCGacha: http://research.operationaldynamics.com/bzr/java-gnome/hackers/andrew/treeview/ is quite "emtpy" [*]  but contains a branch10:29
AfC* we actually want to change things so that a "THERE IS A BRANCH HERE" message appears10:30
AfCGacha: /bzr/java-gnome/hackers is a different repository, and was created with --no-trees10:30
AfCGacha: when you're working locally, you almost always want files present, so --trees10:31
AfC(which is the default now, according to conversation earlier today)10:31
poolie_acf, we should probably just put the image on a static host somewhere and point to that10:31
Gachaso with --no-trees files are keept in the main repo but not in the branch10:32
lapthrickis anyone aware of a branch of ezbzr still around? Nathaniel apparently removed everything from his site, and bzr release didn't make its way into mainline bzr10:32
AfCGacha: the _revisions_ are kept in the repository (Which may be in .bzr, it may be in ../.bzr, whatever)10:33
AfCGacha: whether there is a checkout of the files in that branch is what --trees influences10:33
AfCGacha: like I said, you generally want files, and its default, so don't worry about it :)10:33
Gachaok, thanks10:34
poolie_igc, are you still around?10:37
igcyep10:37
=== rml [n=Skippy@78.32.35.169] has joined #bzr
poolie_igc, i just commented on https://bugs.edge.launchpad.net/bzr/+bug/137449/comments/810:39
ubotuLaunchpad bug 137449 in bzr "status performance regression compared to 0.17" [Critical,Triaged] 10:39
poolie_i think that's why status looks so slow10:39
poolie_so, do you think this is the likely cause,10:40
poolie_and if it is, do you think it'll be hard for me to change the order in which the test components are run?10:40
igcI agree with your assessment ...10:40
=== asabil [n=asabil@ti0035a340-0469.bb.online.no] has joined #bzr
igcand have been meaning to make that change10:40
=== Slant_Laptop [n=scott@CPE-76-178-155-79.natnow.res.rr.com] has joined #bzr
Slant_LaptopHow can I have a directory inside my repo that is a branch from another repo, and will updates will pull from it?10:41
igcit's not a large change but it's not a 10 minute one10:41
poolie_Slant_Laptop: just branch it, and then pull changes in10:41
poolie_it should work in the obvious way10:41
poolie_however, at the moment you can't branch a subdirectory of a branch, if that's what you're talking about10:42
igcpoolie_: a sad workaround right now is, when running by hand at least, to run usertest on one tool ...10:42
igcthen run it again on another10:42
igcyou don't get the nice cross comparison of course10:42
poolie_right, i was going to at least try that and see what happens10:44
igcpoolie_: I'm happy to make the change later this week if you don't get time ...10:44
igcright now, I need to get my osdc tutorial together as the submission date is Sep 3010:45
=== Slant_Laptop_ [n=scott@pool-70-110-37-247.sea.dsl-w.verizon.net] has joined #bzr
Slant_Laptop_Grr, that was annoying.10:46
Slant_Laptop_poolie_: So, if I already have a directory, "a/" that I did a bzr init in.10:46
Slant_Laptop_poolie_: Inside it, do a bzr branch http://blah10:46
Slant_Laptop_poolie_: If I cd into "a/blah" from then on and do a bzr update, it will merge in the upstream updates?10:47
Slant_Laptop_And if I do a bzr push from "a/" it'll push everything under a/ including a/blah?10:47
poolie_Slant_Laptop_: no, it will only push a, you need to push a/blah separately10:48
poolie_but i think there is a plugin (multipush?, maybe in bzrtools?) that will automate it10:48
poolie_if you can't find it, please just ask the list10:49
igcmulti-pull is part of bzrtools10:49
igcnot sure about multi-push though10:49
Slant_Laptop_There is a multi-pull, but I don't see a multi-push.10:50
=== igc food
Slant_Laptop_So, no real solution to the problem? Grr, I don't want to do this in SVN. :-\10:53
lapthrickSlant_Laptop_: there's experimental (yet) nested tree support being worked on, 0.92 I believe is the target. For now, you can use merge-into plugin10:54
lapthrick(I'm using it myself)10:54
lapthrickSlant_Laptop_: it will let you embed a branch inside another10:54
Slant_Laptop_lapthrick: It doesn't seem to be in my 0.90 copy. Do you have a link?10:54
lapthrickSlant_Laptop_: also, I'm working with SVN myself (which is why I know it), and there are bugs right now that prevent it from actually working10:54
lapthrickSlant_Laptop_: bzr plugins page links to it10:55
lapthrickSlant_Laptop_: you will need extra-recent bzr-svn (r716 or newer from http://people.samba.org/bzr/jelmer/bzr-svn/0.4/), but that has a problem of not being able to push into SVN (because there's some breakage which makes it think the branches have diverged)10:56
lapthrickSlant_Laptop_: you will also need https://bugs.launchpad.net/bzr-merge-into/+bug/144108 for merge-into to work10:57
=== Slant_Laptop_ nods.
ubotuLaunchpad bug 144108 in bzr-merge-into "Doesn't work with 0.90 --  no attribute 'base_is_other_ancestor'" [Undecided,New] 10:57
lapthrickSlant_Laptop_: I hope jelmer will fix the push thing soonish, so that it'll work finally10:58
lapthrickSlant_Laptop_: other than that, it works very well, with the caveat that merging upstream changes that move files around (as opposed to just changing their contents) will trigger spurious conflicts, that's probably unfixable before the nested trees support lands in, rendering merge-into obsolete10:59
Slant_Laptop_Hmm, gotcha.11:00
poolie_igc, yes, that seems to be the problem with status11:00
poolie_so that's kind of nice11:00
=== Slant_Laptop_ is now known as Slant_Laptop
=== allenap [i=allenap@nat/canonical/x-67d478ef5e2f3336] has joined #bzr
PengOh, I forgot. 0.91 adds -c. Yay!11:11
Lo-lan-doWhat -c?11:11
Pengbzr diff and other commands.11:12
Lo-lan-doOh, cool.11:12
Lo-lan-doAlthough I prefer diff -u myself :-)11:12
Peng-c revision means changes introduced by that revision.11:12
PengOh, not *that* -c.11:12
Lo-lan-doAh.11:13
lapthrickPeng: h? How is that different from what diff normally does?11:16
=== lapthrick checks to see if gutsy has 0.91 yet
Penglapthrick: Instead of having to do 'bzr diff -r 99..100', you can do 'bzr diff -c 100'.11:17
lapthrickah11:17
lapthrickhandy11:17
PengAlso useful when dealing with a huge revno from a bunch of merges.11:17
lapthrickI was annoyed by the -r99..100 thing11:17
poolie_night all11:19
=== Mez_ is now known as Mez
=== AnMaster [n=AnMaster@unaffiliated/anmaster] has joined #bzr
=== mvo [n=egon@p54A67B72.dip.t-dialin.net] has joined #bzr
=== gabe [n=gabriel@91.84.56.254] has joined #bzr
gabehi all11:44
=== sabdfl [i=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr
matkorHi ! One can safely edit .bzrignore files ? I would like to remove some bad patterns from it ? TIA11:52
Pengmatkor: Yes.11:52
matkorThank you Peng !11:53
Peng:D11:54
lapthrickjelmer: you have a new bug report awaiting12:01
lapthrickjelmer: I actually discovered that while trying to reproduce another bug I ran into in my test repo, where bzr missing shows extra local revisions, yet bzr push says nothing to push12:01
=== asabil [n=asabil@62.70.2.252] has joined #bzr
lapthrickjelmer: there's definitely something wrong going on with diverged branches logic, first is that "can't push, can't merge" bug, then is that "nothing to push" (which I ran into trying to create a minimal testcase for the push bug)12:03
matkorHmmm From where I can download bzr-gtk 0.91.0 ?12:11
lapthrickmatkor: I don't think there is bzr-gtk 0.9112:13
lapthrickmatkor: anyway, just grab it from the plugins page12:13
lapthrickoh wait, it is synced12:14
lapthrickmatkor: https://launchpad.net/bzr-gtk/0.91/0.91.0/+download/bzr-gtk-0.91.0.tar.gz12:14
matkorlapthrick: Thanks !12:15
=== herzel [i=herzel@gateway/tor/x-4fdd64e038888fc7] has joined #bzr
pborlapthrick: do you have a ~ on gnome.org ?12:23
lapthrickpbor: unsure, I know I have an SVN account12:23
pborno, that's unrelated12:23
pborlapthrick: pushing there with bzr push sftp takes forever (I mean it's been running for three hours and it is not even 50% of 1/4)12:24
pborI was wondering if it is normal or related to gnome.org12:24
lapthrickno idea12:24
lapthrickpbor: how big is the push?12:25
lapthrickif it's pushing afresh, then you want to use rspush instead12:25
pborpushing with sftp to localhost took some minutes12:25
pborlapthrick: the gedit repo, so pretty big12:25
=== pbor tries rspush
pbordoes that accept --create-prefix ?12:26
pborit is not mentioned in the help...12:27
lapthrickdunno12:28
lapthrickpbor: but it's a shitload faster, since it uses rsync12:28
pborlapthrick: execept that I get a traceback :/12:33
pborbzr: ERROR: bzrlib.errors.ObjectNotLocked: <WorkingTree4 of /home/paolo/bzr/gedit> is not locked12:34
lapthrickugh?12:35
lapthrickpbor: no idea what it means, I never got it12:35
pborbzr doesn't like me apparently12:35
lapthrickjelmer: I was able to pull command log out of .bash_history, it's now reported as https://bugs.launchpad.net/bzr-svn/+bug/14516512:36
ubotuLaunchpad bug 145165 in bzr-svn "bzr missing reports extra revs, yet push says nothing to do" [Undecided,New] 12:36
lapthrickpbor: well, look at it another way: we whack the bugs now so it's awesome later :)12:37
lapthrickpbor: also, I'd definitely report that one12:38
pborlapthrick: yeah, I started reporting the bugs I am running into12:38
pborspeaking of which, before I report a bogus bug, is this request reasonable:12:39
lapthrickpbor: btw, you can just rsync the branch over, it will work just as well12:39
pborpull, hack, [someone commits an unrelated change to svn] , merge, commit, push12:40
pbornow two revisions are pushed to svn12:40
pbormy hack12:40
pborand the merge12:40
pborcould bzr be smart enough to avoid the 'merge' revision?12:41
mwhpbor: presumably your 'hack' included committing?12:41
pborit's already in svn, that's where I pulled it from12:41
pbormwh: sure12:41
pbor(sorry for omitting that)12:41
mwhi think the same would happen with pushing to a bzr repo then12:41
pboryes, I do not think it is specific to svn12:42
pborbut it (IMHO) sucks a bit12:42
mwhi think a common pattern is "only merge to mainline"12:43
pborit means that for instance I'll have all the commts to po files by translators twice in the history12:43
mwheh, that probably doesn't make sense12:43
pborwell, if I do not merge into my tree it doesn't let me commit12:43
mwhbut anyway, you seem to be asking for a situation where you have a revision in your branch12:43
mwhthen after a push, that revision is _not_ in the target branch12:44
mwhthat seems to violate a pretty important invariant...12:44
pbormwh: I know, in fact I would be happy to avoid the merge if I could12:44
pbormwh: what I am saying is that that revision is already in the 'upstream' branch12:45
pborthat's where I get it from12:45
pbor(because I am forced to)12:45
mwhbut the result of the merge is a separate revision (what if there were conflicts?)12:45
=== mwh wishes for a blackboard
lapthrickheh12:46
pborok, but there weren't... I am asking if there is a workflow to avoid that: in fact (but I still have to try) I think I can do this:12:46
=== jelmer_ [n=jelmer@m400f36d0.tmodns.net] has joined #bzr
pborkeep two branches: one mirrors upstream12:47
jelmer_'morning12:47
lapthrickpbor: besides, the merge results are only shown in the history of the branch that did the merge in the first place. When you commit, the upstream history will only have a revision that says "pbor: merged from upstream"12:47
pborevery time I want to commit I sync the mirror and then merge my hacking branch and then push12:47
lapthrickjelmer_: hiya, can you read jelmer's backlog?12:47
mwhpbor: right, i was going to suggest a different approach here...12:47
lapthrickjelmer_: I reported a couple of bugs12:47
pbormwh: that should work but it's a bit of a PITA :-)12:48
lapthrickjelmer_: and I still have that diverged branches bug, except that I can't even do a merge to fix it12:48
lapthrickpbor says it doesn't happen for him in 0.4.3 tarball, I'm running r719 tho12:48
mwhpbor: well, in True Distributed Style (tm) you only should only merge to mainline and push when your branch is done (bug fixed, new feature working, etc)12:49
lapthrickpbor: actually, could you try if you get that bug with the latest rev of http://people.samba.org/bzr/jelmer/bzr-svn/0.4/ ?12:49
mwhif, in effect, you're using subversion to share your changes then yeah, it's a bit of a pain12:49
pborlapthrick: which bug?12:49
pboroh, got it12:50
lapthrickpbor: bzr push reporting that branches have diverged12:50
pborlapthrick: mmm... I'll try it later, right now I have no pending changes to commit and I'd prefer to avoid bogus test changed in the upstream gedit svn repo12:51
pborlapthrick: I am already waiting to flamed since my commit touched all the files :)12:52
lapthrickpbor: okay, as long as you remember to do it :)12:52
lapthrickpbor: hehe, because of bzr-svn?12:52
pboryeah12:52
lapthrickhow so?12:52
pborno idea... probably the properties12:52
jelmer_pbor: it's only viewcvs that reports all files as changed12:53
jelmer_pbor: if you use 'svn log', you'll see there are only a few files changed by that commit12:53
pborjelmer_: yeah, but I don't think viewcvs is psychic so something must have happened in the repo12:53
pbor:)12:54
jelmer_pbor: Replying to your bugreport atm12:54
pborjelmer_: thanks!12:54
lapthrickjelmer_: I don't see the DivergedBranches bug reported anywhere (not in 0.4 anyway). should I go and create it?12:54
jelmer_lapthrick, which bug do you mean exactly?12:57
jelmer_ok, I'm off again - will reply to the bugs later today01:01
=== pbor goes to lunch too
lapthrickjelmer_: uh-oh, yet more bugs01:08
ubotuNew bug: #145170 in bzr "traceback doing rspush (bzrlib.errors.ObjectNotLocked)" [Undecided,New]  https://launchpad.net/bugs/14517001:10
=== NamNguyen [n=namnt@cm38.delta196.maxonline.com.sg] has joined #bzr
=== cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr
=== Solarion [n=solarion@cruftix.physics.uiowa.edu] has joined #bzr
=== fog [n=fog@debian/developer/fog] has left #bzr []
=== niemeyer [n=niemeyer@200.140.230.150] has joined #bzr
lapthrickso do people actually practice DAGgy bugfixes? Does it work well?02:31
lapthrick( http://www.venge.net/mtn-wiki/DaggyFixes )02:32
mwhlapthrick: i think, in practice, "no"02:33
mwhpeople don't do that02:33
lapthrickbecause it's a bother, or because it doesn't work?02:34
mwhbecause it's a bother02:34
mwhjust my impression of course, both the bzr using projects i follow closely (bazaar and launchpad) have a pretty centralized model in some ways02:35
mwh(i.e. a mainline that contains or will contain almost everything interesting)02:36
mwhthe kernel folks may have a different view02:36
=== nocturn [n=nocturn@ubuntu/member/nocturn] has joined #bzr
nocturnHi all02:39
nocturnWhat is the difference between bzr merge and bzr merge --pull?  In what circumstances do you use --pull?02:40
=== Zindar [n=erik@stockholm.ardendo.se] has joined #bzr
=== herzel [i=herzel@gateway/tor/x-c63a44cec40ff208] has joined #bzr
AfCnocturn: if the thing you're merging actually supersedes the current branch (ie has only got things that you don't have) then you can pull them in on top instead of the revision graph doing a zig-zag02:48
lapthricknocturn: it's a shortcut02:48
lapthricknocturn: equivalent to bzr merge && bzr commit && bzr pull02:48
AfCnocturn: frankly I don't bother anymore, in no small part because our 'mainline' has almost always moved on since the contribution02:48
AfClapthrick: It often seemed to me that `bzr pull` should just do that automatically if it isn't a "needs [manual]  merge"02:49
AfCseems a bit silly to have the question arise02:49
lapthrickAfC: somewhat, yeah02:49
=== asabil [n=asabil@62.70.2.252] has joined #bzr
ikeHello. I have a problem and i'm kinda confused now. Maybe i'm missing something or so. I cannot push my repository to remote server.02:53
ikeThis is what bzr says:02:53
ikeLPA:~/Projects/Repositories/bzr/bffrg ike$ bzr push  bzr+ssh://ike@lu/repository02:53
ikebzr: ERROR: Generic bzr smart protocol error: Permission denied: u'//repository': [Errno 13]  Permission denied: '//repository'02:53
AfClu is a server name that resolves, with /repository in its root directory?02:54
ikeAnd now - i can log into server 'lu' user 'ike' using my keys so.02:54
ikeYes. Lu resolves.02:54
ikeBut /repository doesn't exist.02:55
ikeHm.02:55
ikeI get it. Thanks.02:55
ike:-)02:55
ikeSorry for trouble.02:55
AfCIt's a bit ugly, actually:02:55
AfCwe have things set up so that02:55
AfChttp://research.operationaldynamics.com/bzr/java-gnome/mainline is equal to02:55
AfCbzr://research.operationaldynamics.com/bzr/java-gnome/mainline , but for writing (push) it is02:55
AfCbzr+ssh://centauri.lhr.operationaldynamics.com/export/web/com/operationaldynamics/research/bzr/java-gnome/hackers/andrew/treeview/02:56
AfCwhich is unfortunate02:56
ikeKinda.02:56
AfCthe only workaround would be a symlink called bzr in /. Somehow that doesn't seem quite right.02:56
ikeNo. That's too ugly. ike@lu/home/users/ike/repository is fine.02:57
ikeHm. I still have an error. bzr: ERROR: exceptions.AssertionError: end of file reading from server.02:58
=== bwinton [n=bwinton@mail.phantomfiber.com] has joined #bzr
ikeWhole traceback : http://paste.debian.net/3806603:00
ikeI'll try to figure this out, but if you guys have any suggestions - don't hesitate to tell.03:00
ike:-)03:00
nocturnThanks lapthrick and AfC03:02
=== allenap [i=allenap@nat/canonical/x-a99b1ed2450b703e] has joined #bzr
AfCike: you could upgrade to 0.91 seeing as how you're running your own code anyway03:03
AfCThat'd be the usual start03:03
sabdflwas 0.91 released today?03:12
=== mw|out [n=mw@189.146.13.202] has joined #bzr
AnMasterwhat do I do to update the repo location in a --lightweight checkout03:16
AnMasterthe repo moved03:16
AnMasterbut I got uncommited changes so doing a new --lightweight checkout wouldn't be an optimal solution03:16
Odd_BlokeAnMaster: 'bzr bind <new location>' is probably what you want.03:18
AnMasterbzr: ERROR: Not a branch: http://url.here/03:18
AnMasterand that url is the old location of the repo03:18
AnMasterOdd_Bloke, so it tries to bind the repo of the old checkout03:18
AnMasterthis is a --lightweight checkout, not a full one03:18
Odd_BlokeAnMaster: OK, try 'bzr unbind' followed by that command...03:19
AnMaster$ bzr unbind03:19
AnMasterbzr: ERROR: Not a branch: http://url.here/03:19
AnMaster:/03:19
AnMasterOdd_Bloke, any idea?03:20
Odd_BlokeAnMaster: Hmm, those're all the suggestions I had.  I don't really use lightweight checkouts in anger. :/03:21
lapthrickAnMaster: try bzr shelve, then do a new lightweight checkout03:21
AnMasterlapthrick, that shelve also returns bzr: ERROR: Not a branch: http://url.here/03:21
AnMasterI guess new checkout and then copy files over is the only way03:21
AnMasterlapthrick, there should be a way to repoint where the repo is if the repo has moved03:22
AnMasterlapthrick, like svn switch --relocate03:22
lapthrickAnMaster: there should be03:23
lapthrickoh right03:23
lapthrickAnMaster: there's bzr switch03:23
lapthrickwhich does that03:23
AnMasterPurpose: Set the branch of a lightweight checkout and update.03:23
AnMasterah!03:23
AnMasterthis may work03:23
AfC`bzr pull --overwrite` is a core command that will switch branches quite emphatically.03:23
AnMasterlapthrick, good but if the repo already moved it still tries to access the old repo first and fails03:24
AnMasterlike happened now03:24
mwhthere's a bug about that somewhere03:25
mwhvim .bzr/branch/<something> might work...03:25
AnMasternano but hm03:25
AnMasteror emacs03:25
mwhthis is not the important detail :)03:25
mwh(though, nano?? ew)03:25
AnMastermwh, nano or emacs, but better just say $EDITOR03:26
AnMaster:)03:26
=== statik [n=emurphy@189.66.188.72.cfl.res.rr.com] has joined #bzr
Odd_BlokeEw, emacs.  Stick with nano. ;)03:26
lapthrickeww nano and vi03:27
bwintonStick with Notepad!03:27
lapthrick(though I actually use nano for my commit messages, too lazy to set up $EDITOR)03:27
=== Odd_Bloke doesn't have $EDITOR set but bzr still uses vim for my commit messages.
=== allenap [i=allenap@nat/canonical/x-be02892243c90e76] has joined #bzr
=== AnMaster mostly uses -m 'Message here'
=== statik [n=emurphy@189.66.188.72.cfl.res.rr.com] has joined #bzr
AnMasterthough:03:28
AnMaster$ echo $EDITOR03:28
AnMaster/usr/bin/emacs03:28
AnMaster:)03:28
AfCA bit hard to do good quality multi line messages with -m03:29
=== sabdfl [i=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr
AnMasterAfC, that is true03:29
AnMasterbut well, it depends on how big changes you do03:29
Lo-lan-doI have started using -mm for really minor commits03:29
Lo-lan-doTypos and the like.03:29
AnMasterinteresting in a repo (as in init-repo)03:29
AnMaster $ bzr st03:29
AnMasterbzr: ERROR: [Errno 2]  No such file or directory03:29
AnMasterit should say like when it is not a branch or repo:03:30
AnMaster$ bzr st03:30
AnMasterbzr: ERROR: Not a branch: /some/dir03:30
AnMasteror maybe "not a branch, this is a repo)03:30
AnMasteror something like that03:30
AnMasterbut the "no such file or directory" seems bad03:30
lapthrickLo-lan-do: what's -mm?03:32
Lo-lan-doUse "m" as a commit message?03:32
AnMasterthat isn't very informative03:32
Lo-lan-doAs in "minor fix"03:32
AnMasterbzr ci -m 'Fixed typo'03:33
AnMasteror something like that is what I do03:33
AnMasteror even03:33
AnMasterbzr ci -m 'Fixed typo in log message in src/foo.c'03:33
Lo-lan-doWell, I don't really need much information in commits on my blog entries.03:33
AnMasterblog? what do you mean?03:34
AnMasterwhat has blog got to do with bzr?03:34
Lo-lan-doAnd I like important commits to stand out and not be drowned under big but useless messages.03:34
Lo-lan-doI use ikiwiki for my blog.  I edit articles on a local copy (it's an SVN checkout, but whatever), and the HTML gets generated and pushed online with a commit hook.03:35
AnMasterhm03:35
AnMasterinteresting03:35
=== luks [n=lukas@wired-201.fi.muni.cz] has joined #bzr
=== BasicOSX [n=BasicOSX@216.243.156.81] has joined #bzr
=== sabdfl [i=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr
=== Enquest [n=Enquest@d54C28B91.access.telenet.be] has joined #bzr
EnquestI don't understand the how to publish my webproject03:42
=== allenap_ [i=allenap@nat/canonical/x-65bb68ad8b2f3996] has joined #bzr
=== bac [n=bac@canonical/launchpad/bac] has joined #bzr
EnquestI try to use the push command but it only creates a .bzr file in the destination dir03:43
=== bwinton [n=bwinton@mail.phantomfiber.com] has left #bzr []
=== schierbeck [n=daniel@disko.egmont-kol.dk] has joined #bzr
Odd_BlokeEnquest: You'll need to also checkout a working directory there.03:43
schierbeckp03:43
EnquestWhat is the difrence then?03:44
Enquestwhy use push then?03:45
Odd_BlokeEnquest: At the moment, you have pushed the branch and repository, which is enough for a branch which is just being served.  If you also want the contents reconstituted there, you need to create a checkout (look at the push-and-update plugin at https://launchpad.net/bzr-push-and-update/).03:45
Enquestis the bazaar server down... No response of the website?03:47
mwhthe canonical data centre is having a bad day, it seems03:48
Odd_Bloke:(03:48
gabeit seems the ubuntu forums are shot away, at least for me03:49
gabe:(03:49
=== statik [n=emurphy@189.66.188.72.cfl.res.rr.com] has joined #bzr
=== statik [n=emurphy@canonical/launchpad/statik] has joined #bzr
=== lazy1 [n=tebeka@208.77.235.2] has joined #bzr
=== mwh [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr
Enquesthow do I deploy my website in best. Know that some info changes... like some PATH info and mysql settings ?03:52
EnquestWhat is the best way to avoid every update to my website changing those paths03:53
gabeuse relative paths where possible?03:56
sabdflmwh: it's upstream ISP, not the data centre itself, afaik04:03
mwhsabdfl: ah right04:04
=== BasicOSX [n=BasicOSX@216.243.156.81] has joined #bzr
=== mw|out is now known as mw
Mezis ther eanywhere that I can show someone an example of bzr#'s "much better branching and merging" to try and convionce the people ar work regarding it?04:34
=== pmezard [n=pmezard@dhcp26-226.enst.fr] has joined #bzr
=== bac_ [n=bac@cpe-065-190-191-245.nc.res.rr.com] has joined #bzr
=== asabil [n=asabil@62.70.2.252] has joined #bzr
=== bac_ is now known as bac
=== bac_ [n=bac@cpe-065-190-191-245.nc.res.rr.com] has joined #bzr
radixargh, "bzr log |head" in gutsy causes a crash report dialog to pop up :\05:06
fullermdlapthrick, mwh: I daggy sometimes, when I think there's a good chance it'll be useful.  Not as a reflex, though.05:07
=== bac_ is now known as bac
=== cprov is now known as cprov-lunch
=== pmezard_ [n=pmezard@dhcp26-226.enst.fr] has joined #bzr
=== lazy1 [n=tebeka@208.77.235.2] has left #bzr ["Leaving"]
=== orospakr [n=orospakr@132.213.238.4] has joined #bzr
=== jelmer is now known as jelmer_
=== jelmer_ is now known as jelmer
AnMasterradix, shouldn't it simply dump core?05:43
AnMaster<-- not ubuntu user05:44
AnMasterbut "crash report dialog" sounds too much like windows for me05:44
radixAnMaster: well, the issue is that "bzr log |head" raises an exception in bzr now05:44
radixit's an old bug that was fixed and seems to have regressed back05:45
AnMasterradix, that sucks, but what I wondered about was why it simply doesn't dump core / traceback, why a *dialog* poping up for it05:45
AnMasterthat would only work inside X05:45
AnMasterbreaks horribly if you aren't running X atm05:45
radixAnMaster: forget the dialog :)05:46
radixAnMaster: it's not related to bzr05:46
AnMasterradix, I use freebsd mainly, a dialog poping up sounds way too much like windows05:46
radixAnMaster: I'm sorry you feel that way05:46
AnMasterradix, thanks for the warning though, I will avoid ubuntu now, I prefer to work from command line05:47
AnMaster:)05:47
AnMaster(but indeed this isn't a flamewar channel)05:47
radixfwiw, nothing bad happens if you're not in X05:47
AnMasterthat is at least a good thing, but even in X I prefer getting a core dump / python traceback05:47
radixyou still get those.05:47
AnMasterI will stay with FreeBSD, slackware and gentoo :)05:48
datoradix: hm, I don't get an exception with bzr.dev05:50
datoah05:50
datobut gutsy is closed05:50
radixmaybe it was refixed05:50
radix0.90.0 seems to be raising the exception05:50
datoright, here too05:50
datobut 0.91 not05:51
radixcool05:51
=== rml [n=Skippy@78.32.35.169] has joined #bzr
AnMasterradix, um on gentoo with 0.90.0 bzr log | head does NOT cause any traceback05:56
AnMasterand there is almost 500 revs in this project05:57
AnMaster$ bzr --version05:58
AnMasterBazaar (bzr) 0.90.005:58
pborjelmer: "if you would like to avoid this, use the 'rebase' command, which makes sure history stays linear"... I can't see any rebase command, can you give me a link?06:01
Lo-lan-dopbor: It's an external plugin06:01
=== pbor looks
pborthanks Lo-lan-do06:01
=== statik [n=emurphy@189.66.188.72.cfl.res.rr.com] has joined #bzr
pborwhooo... that looks *really* interesting06:03
pborI guess that it would allow me to adapt my workflow with svn06:06
pborI just need to rebase before pushing06:06
pborso that I do not need to merge the translator chnages06:06
=== GaryvdM [n=chatzill@mtngprs5.mtn.co.za] has joined #bzr
pborjelmer: so if I understand correctly, the fact that all the files where "touched" is due to the fact that there was a commit to svn between the time I pulled and the time I pushed? So if did rebase before pushing I would have avoided the problem with viewcvs?06:08
=== p4tux [n=p4tux@189.169.63.170] has joined #bzr
=== dpm [n=dpm@p54A11CDC.dip0.t-ipconnect.de] has joined #bzr
=== cprov-lunch is now known as cprov
jelmerpbor: The rebase plugin is listed on the plugin page06:45
jelmerpbor: the fact that you merged upstream at some point causes the problem06:45
pborjelmer: so if I rebase instead of merging I avoid the issue06:46
jelmeryep06:46
pborneat06:46
Lo-lan-doHmm.  Would that apply to me too?06:46
jelmerI'd recommend using the 0.1 version of rebase though, current trunk is a bit unstable06:46
=== schierbeck [n=daniel@disko.egmont-kol.dk] has joined #bzr
pborjelmer: will rebase in the future also allow to "squash" changeset together?06:47
jelmerpbor: not really... why would you want to do that?06:49
james_wpbor: you will be able to do that with pure bzr soon.06:51
pborjelmer: suppose on the branch I have two changesets: "Implement feature X" and "ops fix compilation", now when I want to rebase it against the main repo I want also to just have one changeset and "delete" the typo from the history06:52
pborjames_w: awesome06:52
=== fog [n=fog@debian/developer/fog] has joined #bzr
=== marianom [n=marianom@ubuntu/member/marianom] has left #bzr []
=== p4tux [n=p4tux@189.169.63.170] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== Vernius [n=tomger@p508AE685.dip.t-dialin.net] has joined #bzr
=== GaryvdM [n=chatzill@196.11.241.41] has joined #bzr
=== rml [n=Skippy@78.32.35.169] has joined #bzr
=== p4tux [n=p4tux@189.169.63.170] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== phanatic [n=phanatic@dsl5402BAFE.pool.t-online.hu] has joined #bzr
=== fkumro [n=fkumro@pool-71-186-136-74.bflony.east.verizon.net] has joined #bzr
=== p4tux [n=p4tux@189.169.63.170] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr
=== Mez_ [n=Mez@ubuntu/member/mez] has joined #bzr
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
=== Mez_ is now known as Mez
=== Mez_ [n=mez@ubuntu/member/mez] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== cypherbios [n=cyr@ubuntu/member/cypherbios] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
GaryvdMHi phanatic10:06
phanatichey Gacha10:08
phanaticheh10:08
phanaticsorry10:08
phanaticGaryvdM :)10:08
GaryvdMI can't decide what I want to work on next10:09
GaryvdMEither10:09
GaryvdMhttps://blueprints.launchpad.net/bzr-gtk/+spec/gannotate-viz-integration10:09
GaryvdMhttps://blueprints.launchpad.net/bzr-gtk/+spec/viz-pending-merges10:09
GaryvdMor10:09
GaryvdMhttps://bugs.launchpad.net/bzr-gtk/+bug/12773410:09
ubotuLaunchpad bug 127734 in bzr-gtk "Progress bars as widgets" [Medium,Triaged] 10:09
phanaticGaryvdM: fixing the progress bars would be really awesome10:10
GaryvdMRight thats what I'll do, but I need some clarification on what we want :-)10:11
GaryvdMI thnk I'm going to flesh out a blueprint before I start coding...10:11
pboryou guys work on the gtk ui?10:12
=== lifeless [n=robertc@ppp245-86.static.internode.on.net] has joined #bzr
GaryvdMYhea10:12
=== pbor noticed some buglets
phanaticpbor: yep, feel free to report them, we're actively squashing bugs ;)10:12
pborwell, not bugs but things that could be better wrt to gtk10:13
phanaticGaryvdM: cool. the basic idea is to fix the progress bars. now they are 1) ugly 2) don't close automatically10:13
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr
phanaticpbor: please share your thoughts with us10:14
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
GaryvdMAnd it would be nice if they we intragrated in to the existing ui?10:14
pborlike the gstatus missing the proper shadow type in the scrolled window and having a horizontal separator that should not be there10:14
pboror why visualise doesn't use a toolbar dor the back/forward buttons at the top10:15
phanaticGaryvdM: exactly, now they are separated a bit10:16
=== BasicOSX [n=BasicOSX@216-243-162-1.static.iphouse.net] has joined #bzr
GaryvdMCool10:16
pborgmissing is particularly ugly with those frames10:16
phanaticpbor: these are still bugs in my opinion :/10:16
=== Mez [n=Mez@ubuntu/member/mez] has joined #bzr
pborI guess my eye is too used to the HIG-police :)10:17
phanaticyeh, i'm pretty sure that there are quite a few HIG-unaware stuff unfortunately10:18
=== GaryvdM starts reading HIG section on progress windows and bars
pborfor prgress bars the easiest thing is probably put it in a statusbar10:23
pborunless you want to do something fancy as gedit message area10:24
pborbut you'd need to redo that widget from scratch in python10:24
GaryvdMSorry -  I have now idea what the gedit message area looks like10:25
GaryvdMI work mostly on windows...10:25
pborGaryvdM: open a file long a few pages in gedit and do print preview10:25
pborah ok10:26
=== BasicMac [n=BasicOSX@warden.real-time.com] has joined #bzr
pborGaryvdM: something like http://www.gnome.org/~paolo/screenshots/new_mdi/open-progress.png10:27
pbor(that screenie is a bit old)10:27
GaryvdMThats cool.10:27
GaryvdMThat would better for something like gcommit where we need to cater for both olive and gcommit.10:29
phanaticyep10:29
pborbtw, the olive toolbar doesn't respect my toolbar settings10:30
GaryvdMAnd I think some operations might meret a Checklist Window.10:30
=== pbor vanishes... later guys
phanaticpbor: thanks for you valuable comments10:31
=== bialix [i=chatzill@77.109.16.188] has joined #bzr
Peng"``Transport.should_cache`` has been removed." is listed twice in NEWS for 0.91rc1 or whatever, undder both "API breaks" and "Testing".10:32
bialixhi people10:33
=== jkakar [n=jkakar@204-174-36-45.dhcp802.dsl.ucc-net.ca] has joined #bzr
datojelmer, siretart: I uploaded bzr 0.91 and bzr-gtk10:34
datojames_w: I'll do bzr-builddeb tomorrow10:35
james_wdato: thanks.10:36
james_wphanatic: in notify.py it should be  self.zeroconfserver.run() rather than .start()10:38
phanaticjames_w: thanks, but i don't really know that part of the code, since it's pretty new, and i still couldn't catch up with that part (i was away on a soc duty with gnome)10:40
james_wI've tested the fix, it was just late, and seemed a little trivial for bug report/patch. Are you ok to just make the fix?10:41
phanaticsure, thanks again!10:43
james_wno problem.10:44
=== Mez [n=Mez@ubuntu/member/mez] has joined #bzr
siretartdato: thanks!10:51
=== jrydberg [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr
=== bialix [i=chatzill@77.109.16.188] has left #bzr []
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr
lifelessjelmer: 06:01 < jdub> lifeless: that whole svn-upgrade problem still exists -- no bzr-rebase in the repos, so can't do anything with bzr-svn atm11:25
lifelessjames_w: are you aware of pull --merge ?11:29
=== bratsche [n=cody@adsl-68-94-47-188.dsl.rcsntx.swbell.net] has joined #bzr
bratscheHi guys, I might have a small but annoying bug here.. or maybe I'm doing something wrong.11:32
bratscheI do: bzr diff -r ancestor:url-to-my-ancestor-branch11:33
bratscheIt works fine if that url starts with sftp:// but it fails and crashes bzr if that url starts with bzr+ssh://11:33
datolifeless: do you mean `merge --pull`?11:33
bratscheIs there something obvious I'm doing wrong, or is this a bzr bug?11:33
lifelessdato: something like that; james wrote a bzr-for-git page, and it says that we always do a commit to merge branches where git does, but this is bogus. Git simply chooses not to do a merge some of the time.11:35
lifelessand we have that as an option - merge --pull11:35
lifelesss/does/does not/11:35
lifelessbratsche: I think its a bzr bug11:35
bratschelifeless: Seems like maybe the + is confusing the commandline arg parser, but I'm not sure.11:36
lifeless011:36
lifelessbratsche: could be11:36
lifelessbratsche: file a bug ?11:36
bratscheOkay, sure.11:36
bratscheWhere is bzr's bug tracker?11:37
james_wlifeless: yess, why?11:37
lifelesshttps://launchpad.net/bzr/11:37
=== Demitar [n=demitar@c-212-031-182-147.cust.broadway.se] has joined #bzr
bratscheThanks11:38
james_wlifeless: ah, I see now. I'll update the page.11:38
lifelessjames_w: you say that 'merges in bzr require a commit regardless of conflicts'. Its not clear to me whether you are talking about git fast-forward, or if git automatically does a commit for you ?11:38
lifelessif you are talking about fast-forward, thats actually a case of skipping a merge, rather than not requiring a commit11:38
james_wyeah, it also automatically commits when there are no conflicts, so both need to be highlighted.11:39
lifelessif you are talking about git doing a commit for you, thats dangerous (because  textual conflicts are not a good indicator of semantic conflicts), and its worth noting why we don't autocommit there11:39
lifeless(there was a thread on the hg list about exactly the same behaviour just this week)11:39
james_wyeah, I was trying to avoid editorialising, I got a bit close with the left hand parent discussion, but it's obviously an evolution, so we can decide whether to include that there, or have another section for some 'why we think bzr is better' comments.11:41
lifelessok, so concretely then ...11:42
lifelesswe can fast forward11:42
=== dewd [n=dewd@201009147182.user.veloxzone.com.br] has joined #bzr
lifelessso how it feels different can say 'bzr will fast-forward merges if you supply --pull'11:43
lifeless(rather than by default)11:43
lifelessbut when it cannot fast forward it requires a commit be done11:43
lifelessor someting like that11:43
lifelesswe don't want a page that a git user that things git is just perfect can point at and say 'look at all the differences, thats why I don't use bzr'11:44
lifelessmmm, I think I'm saying 'vive la difference'11:44
lifelessexcuse the mangled french :)11:45
lifelessbbiab11:47
james_wyeah, I'll clean that page up.11:48
ubotuNew bug: #145383 in bzr "bzr fails with diff -r ancestor:bzr+ssh://branchname" [Undecided,New]  https://launchpad.net/bugs/14538311:51
lapthrickdoes ubotu announce bzr-svn bugs too?11:56
=== Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr
jelmerlifeless: sorry about that, it's still on my todo list11:57
jelmerlapthrick, no[e11:57
jelmers/[/p/11:57

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!