=== ajaksu is now known as ajaksu_away
=== ajaksu_away is now known as ajaksu
nysinI've tried importing an svn repository using svn-import of the bzr-svn plugin via bzr 1.3 using both the none and branch schemes, and it doesn't seem to preserve history across what were svn cp's01:00
floamis there anything fairly easy one can do to automatically get the revision number into a controlled source file on commits?01:01
jelmernysin: that's correct, bzr does not support copy tracking01:02
floamwhat I did now is I have version = 120 in one of my files that I try to remember to manually increment each time -- but it's a losing battle01:02
nysinOh. I took "Follow branch copies. Revision history is not truncated when a branch was copied in Subversion." from the BzrForeignBranches page to mean something else?01:02
jelmernysin: that's copies of branches, not copies of directories or files01:03
nysinAh, alright.01:03
nysinWhich means that it doesn't matter which branching scheme svn-import uses with regards to intra-repository history tracking?01:04
nysin(The reason I tried to use scheme=none was to get that history)01:05
jelmernysin: yes01:05
nysinOkay, thanks.01:07
jelmernysin: Or perhaps, another way to look at it is01:10
jelmernysin: only copies of the root of a branch are tracked01:10
jelmernysin: so if you copied /branches/foo to /trunk and you use scheme=trunk, bzr will keep the history of that branch01:11
jelmernysin: if you use scheme=trunk and you copied /trunk/foo to /trunk/bar, that will not be tracked01:11
nysinHm. That's more or less what I did. The former.01:11
nysinBut I guess not via a branch.01:11
nysinIt started as /svn/trunk, then a big change happened, so I split off that version to /svn/branches/foo and branches/bar01:12
nysinAnd then finally branches/bar back to /trunk when it stabilized01:12
nysinBut it was all via svn copy01:12
jelmerit should show all history for that then01:13
nysinHow might I determine why it isn't, then?01:13
nysinOr, maybe it is an I'm missing it somehow01:14
jelmeris this a public repository?01:14
nysinThe svn is, yeah01:14
nysinURL in a moment. bzr is all local so far01:14
nysinhttp://colon.ath.cx:8008/svn/ should work01:14
* jelmer tries with bzr-svn 0.4.901:15
nysin /trunk/foo is branches/wtl01:16
nysin /trunk/bar is branches/smartwin01:16
nysiner /branches/... for the first two in those01:16
nysinOh, yeah, and that's the bzr-svn version I was using too, from Debian unstable.01:17
nysinScriptManager.{cpp,h} as well as the scripts/ directory are files that should have retained a history amongst the longest...01:19
jelmernysin: branches/wtl and branches/smartwin are unrelated in that svn repository01:21
nysinwtl should have no offspring to speak of01:22
jelmernysin: where exactly were you expecting it keep history but it isn't?01:22
nysinAlright, for example the scripts directory01:23
nysinwhich was copied around unchanged from one part to another01:23
jelmerfrom wtl into smartwin you mean?01:24
nysinAs well as trunk/ from smartwin/, which is just a big scp copy01:24
nysinsvn copy01:24
jelmernysin: that's a directory copy though01:24
nysinWhich you said wasn't covered, yes01:24
jelmernysin: not a branch copy01:24
nysinI guess I wasn't clear on that distinction whilst using svn - it worked about as well either way01:24
jelmerthe copy from /branches/smartwin to /trunk appears to be picked up correctly here with history retained01:25
jelmernysin: svn doesn't have a notion of branches01:25
jelmerwhich is one of its strongest advantages and one of its weaknesses :-)01:25
nysinYeah, and its documentation discusses copies as 'light branches' of sorts01:25
nysinI really like that01:25
nysinVerifying locally though01:26
nysinthe history...01:26
nysinYeah I don't see it01:27
nysin"bzr log formatting.lua" has only one entry01:27
nysinin trunk.01:27
jelmernysin: that's correct, because it was introduced by a directory copy (r820)01:29
nysinYeah, which you said before etc. I had accepted that and then I got confused when you said you did in fact see some cross-branch history preserved01:30
jelmernysin: right, with copies such as the one in r818 history is preserved01:30
nysinAlright, but when I actually go and check that in the wtl directory...01:32
nysinbranches/wtl$ bzr log --short changelog.txt01:33
nysin  818 cologic   2008-01-1801:33
nysin      archive WTL 0.699d version01:33
nysinAnd that's it01:33
nysinIt did have a history before that..01:33
jelmernysin: I mean r818 in svn01:33
nysinYeah my current bzr is no-branches so they match revision-wise01:34
nysinsvn818 is the trunk -> wtl branch in both repositories specifically.01:35
nysinor bzr81801:35
nysinBut regardless, I'm trying to see what history you're saying it's preserving? I might be missing something there01:36
jelmerThat's only true for scheme=trunk01:36
jelmerWhich causes /trunk and /branches/wtl to both be considered branches01:36
nysinhm? scheme=trunk produced local revision #s01:36
jelmerrevision numbers are per-branch in bzr01:37
nysinSure, so they weren't going to match svn. Which is fine and all, but just means that I don't see what correspondence you say works with and only with scheme=branch?01:38
jelmerhistory preservation only works when copying branches01:39
jelmerscheme=trunk causes "/trunk" and /branches/* to be considered branches01:40
jelmerscheme=none considers "" to be considered a branch01:40
nysinNow it makes sense01:40
nysinI've been looking at the no-branch version (I archived both so I'll go look at the branching version now...)01:40
nysinMuch better.01:45
jelmerIt would be nice if bzr could support file copy tracking at some point, even if just for log and annotate01:50
nysinWhen I was Googling I found some mailing list messages all the way back from the 0.10 era agreeing with that01:51
nysinAnd, especially, since svn at least does treat copies as 'branches' of sorts, then it seems pretty useful.01:53
nysinOh, there's even a spec on it ( https://launchpad.net/bzr/+spec/filecopies ) which gets at the usage scenarios02:08
troi swear i got bazaar to include the diff in the commit note (in the ignored section) somehow, but i can't remember how i did it :/02:35
trois it a config option?02:35
beunotro, just do bzr commit02:36
beunowithout -m02:36
beunoah, no, wait02:36
troall i get is the modified files list02:36
beunoyes, that's right02:36
trobzr ci --show-diff02:37
Stavroswhy is bzr always telling me about conflicting tags? i just moved the tag, i want it to be moved on the remote branch as well02:52
Stavrossorry, i left by mistake02:52
spivStavros: push --overwrite02:53
Stavroshmm, thanks02:53
Stavrosshouldn't that be done normally, though?02:53
spivStavros: bzr won't overwrite a tag by default, because it doesn't know which one is the one you want to use.03:00
Stavrosso it doesn't save the change of the tag as well, huh..03:01
ubotuNew bug: #212645 in bzr-svn "cannot import name CachingParentsProvider" [Undecided,New] https://launchpad.net/bugs/21264504:10
ubotuNew bug: #212649 in trac-bzr "Viewing a changeset in trac 0.11 produces traceback" [Undecided,New] https://launchpad.net/bugs/21264904:40
=== mwhudson__ is now known as mwhudson
cammoblammoWhat are the differences between bzr branch, clone and get?06:32
mwhudsonthere are none06:33
spivcammoblammo: $ bzr help branch | grep Aliases06:33
spivAliases:  get, clone06:33
spivcammoblammo: they're all the same command06:33
cammoblammoAh. I thought I saw that somewhere, but I couldn't find it!06:35
cammoblammoI've got an existing working branch that I want to turn into a shared repository without the tree. What's the canonical way to do it (or can I just copy the branch and remove all the non .bzr directroies?)06:47
spivcammoblammo: branch it into a shared repository (initialise the repo with "bzr init-repo --no-trees PATH")06:49
cammoblammoThat's what I thought. I wasn't sure if that worked for already existing repositories.06:50
cammoblammoOkay. I successfully tried "bzr init-repo --no-trees --rich-root-pack SharedRepo"06:57
cammoblammoHowever, "bzr branch OldRepo SharedRepo" complains that the repo exists already. But of course it does...06:57
cammoblammoHang on, shouldn't I be using the import command?06:58
cammoblammoDon't worry folks, I'm having a brain fart. I've figured it out, and yes I am embarrassed.07:04
exothermc_does bzr preserve perms and ownership?07:16
=== Verterok is now known as Verterok_
exothermc_bah looking for a good solution to manage my server config files such as /etc07:17
exothermc_svn does it but only with a wrapper07:17
bob2(which layers on top of bzr)07:18
exothermc_ahh ok07:18
exothermc_does it hook into rpm as well?07:18
exothermc_one last question do newly created files and dirs get automatically added to the repository?  also are deletes removed?07:23
cammoblammoCan an existing branch be turned into a --no-trees cwntral repo?07:28
bob2exothermc_: bzr records deletions automatically, but not additions07:30
bob2not sure what etckeeper does on top of that07:31
bob2cammoblammo: not, afaict, through the ui07:31
bob2cammoblammo: bzr reconfigure --no-trees would get rid of the working copy, though07:31
bob2cammoblammo: is the branch just too big for you to create the repository and then branch into it?07:32
cammoblammoI'm trying to reconfigure my set up so I can put my repo on a server at home rather than the free piece of rubbish my ISP gives me (no ssh, etc.)07:34
bob2so, is "bzr init-repo --no-trees --rich-root-pack repo ; bzr branch /your/branch repo/branch" what you wany?07:36
cammoblammoSomething like that. I did try that sort of thing, but I had problems. I'll try it again and see if it an operator error ;-)07:36
cammoblammoHm, same thing. I end up with a treeless version of my branch in a directory in the repo.07:39
cammoblammoSo it looks something like /home/cammoblammo/repo/branch/.bzr07:40
cammoblammoWith a .bzr in the /repo directory as well.07:40
spivcammoblammo: isn't that what you're after?07:40
cammoblammoNot quite. I was after /home/cammoblammo/repo/.bzr without anything else in there. That's how my current repo at my ISP looks.07:42
bob2standalone repos always have .bzr in the root and in the branch...07:43
bob2what you have at your isp looks like it's just a standalone branch with no working tree...07:44
cammoblammoThat's what I'm trying to get here. Isn't that how it's supposed to look?07:44
bob2not if you want a shared repository07:45
bob2what was your original goal (i.e. not "make it look like the existing one")?07:45
cammoblammoI need to be able to access my repo from work. I used to run a svn server here at home, but when I changed to bzr I moved the repo to my ISP to save space on my home machine (not to mention give me more reliable access when I'm on the road). The ISP only lets me use ftp, though, which is a big performance hit. I want to move it back to try using bzr+ssh.07:48
bob2sounds like a shared repository would work well for you.  'bzr init-repo --no-trees repo', then branch things into it.  the branches will be in subdirs under repo (and have their own, small .bzr dirs), but all the revision data gets store in repo/.bzr, so it's not duplicated.07:51
cammoblammoWell, if that's what I have to do ;-) It will look a bit silly though --- I'm only running one branch. Of course, I don't have to look at it, do I?07:52
bob2ah, ok, now I understand07:53
cammoblammoAs another thought, will it work if I just copy the directory at my ISP? It's probably dirty, but...07:53
bob2don't make a repo then, just create a branch07:53
bob2that will work fine07:54
cammoblammoOut of interest, is there any reason I shouldn't just copy the repo over?07:56
bob2btw, "repo"  is generally used to mean something else (what init-repo produces) in relation to bzr, hence my confusion earlier07:58
bob2sure, you can copy it over07:58
cammoblammoOh well then, problem solved! I've never seen that sort of approach mentioned in the docs, so I figured it must be discouraged for some reason. Then again, that's how I got it to the ISP in the first place.07:59
bob2"bzr branch /home/cammoblammo/repo/ ftp://blahblah" should just work, as well08:00
cammoblammoHmm, let's see...08:03
* cammoblammo is waiting very patiently...!08:04
cammoblammoWell, something's coming down the tubes...08:05
cammoblammobob2: It worked, but it wasn't treeless, even though I initialised the repo that way. Oh well.08:21
bob2oops - bzr reconfigure --branch ftp://...08:23
cammoblammobob2: Yeah, I picked up on that.08:40
cammoblammoHang on, no I didn't.08:40
cammoblammoLet me see now...08:41
cammoblammoWell, close! I took a copy of a standard working branch and ran the reconfigure command over it and it worked.08:50
cammoblammoNow for another problem :-( !08:51
cammoblammoI can check the shiny new repo out locally, but via bzr+ssh I get a problem: ERROR: Repository KnitPackRepository(local details) is not compatible with Repository RemoteRepository(Repo details)08:53
bob2what does "bzr info" say when run in the same location that is giving you that error?08:54
cammoblammoDo I have to change the repository format?08:54
cammoblammoSorry, missed your message. One sec...08:56
cammoblammoBound branch format: pack-0.9208:57
cammoblammoThe repo (if I can use that word) is rich-root-pack.08:58
bob2that's the entire output?08:58
bob2the related branch part isn't important08:58
cammoblammoYes, apart from the Location and binding info.08:58
bob2whici is what I wanted to se...08:59
cammoblammoOops. One tic...08:59
cammoblammobranch root: .09:00
bob2the error could be because you're inside a repo made with init-repo, or it could be because you're co'ing from rich-root-pack09:00
cammoblammoHmm. I'm trying a clean checkout, so I'm not inside anything relevant (and I did check that).09:01
cammoblammoIs there a problem co'ing from a rich-root-pack?09:01
bob2ah, ok.  it's because co has a bug and uses the bzr default format for the checkout, instead of the remote branch format09:01
cammoblammoYay me! I didn't do something wrong (for once). Is there a work around, or do I have to somehow reconfigure the repo?09:02
bob2you can either: "bzr branch ftp:/// foo ; bzr reconfigure --checkout foo" or "bzr init-repo --rich-root-pack repo ; bzr branch ftp:// repo/blah" wwwwwwwwww09:03
bob2note that rich-root-pack is generally only useful if the branch came from svn (or you're z bzr developer)09:03
cammoblammoReally? Someone here told me it was now the default and I should upgrade.09:04
cammoblammoAnyway, let's give it a go...09:05
bob2default's still pack-0.2 afaik09:05
cammoblammoDon't believe everything you see on IRC!09:06
luksyou can generalize that to The Internet :)09:06
cammoblammoActually, you can generalise that to anything involving, well, anything.09:07
cammoblammoGuess what guys? IT WORKED!!!!! I now have a treeless copy of my project which is functioning as a shared repository for at least two other machines, and I've lost no history along the way, but I have gained bzr+ssh functionality. YIPPEE!!!09:11
cammoblammo(Now I can get back to work)09:12
cammoblammoOh yeah, thanks bob2 (and everyone else for putting up with the noise).09:12
bob2no worries09:13
cammoblammoSee you on #emacs!09:13
matidHello there. I was wondering, has any of you managed to set up svn integration in Bazaar on OS X?11:12
matidI'm having issues with python bindings.11:12
matidI compiled svn 1.6 from source and installed python bindings with 'make install-swig-py' but bzr keeps telling me "Installed Subversion version does not have updated Python bindings."11:14
matidAnd whenever I try to run 'from svn import fs, repos, core' in python it says:11:15
matidAny ideas?11:18
jelmermatid: did you follow the instructions on the wiki?11:57
matidjelmer: Yeah, I did.11:58
matidYou're referring to http://bazaar-vcs.org/BzrForeignBranches/Subversion right?11:58
matidThey refer to svn 1.5 even though trunk is 1.6 now, so atm I'm trying to build it with the 1.5.x branch.11:59
matidWe'll see if it works.11:59
matidjelmer: No luck.12:12
matidStill the same issue, both with svn 1.6 and 1.512:13
jelmeryou probably have another svn install that's conflicting with the one you just installed12:14
matidjelmer: Yeah, I've got one that is installed with Mac OS X by default, but it shouldn't conflict with the new one...12:17
jelmermatid: I don't know then, sorry.12:20
jelmerit's getting the wrong svn library for some reason though12:21
matidOK, thanks for your help anyway.12:27
matidI'll try to work it out on my own.12:27
pborif I have a shared-repository on a remote server (sftp), can I push a new branch on that server?12:33
iKspbor: as far as I know yeah, there's no problem in doing that12:34
iKsbzr push sftp://yourserver/your/directory/12:35
* pbor tries12:35
pborthe shared repo docs only mention "branch", that's why I ask12:36
pborworked great12:40
matthewlmcclureI had a branch in a shared repository.  I did: $ bzr reconfigure --lightweight-checkout; then $ bzr reconfigure --branch .  Now the branch is missing revisions.  Any way to get them back?14:41
Odd_Blokematthewlmcclure: What does `bzr info` report the repository location (of the branch) to be?14:50
matthewlmcclure$ bzr info14:51
matthewlmcclureRepository tree (format: pack-0.92)14:51
matthewlmcclure  shared repository: /c/home/mlm/sandbox/bzr/repo14:51
matthewlmcclure  repository branch: .14:51
Odd_BlokeThat's odd.14:57
Odd_BlokeI don't really know what else to try...14:57
james_wmatthewlmcclure: installing the heads plugin and using that may help you resurrect the missing revisions.14:58
matthewlmcclurejames_w: presumably because they are in my shared repo still?14:59
james_wmatthewlmcclure: yeah, they won't have been deleted.15:00
BrongerCan anybody explain http://dpaste.com/43416/ to me?  I try to update an SVN repo.15:01
BrongerSorry, forget it, my fault.15:02
matthewlmcclurejames_w: thanks... is this a bug/missing feature in 'reconfigure'.  shouldn't it protect the user from this?15:05
james_wmatthewlmcclure: it sounds like it may be a bug.15:09
james_wit would be interesting to know what about your setup caused it15:09
james_wit may be the fact that you were in a shared repo, or it may have been something else.15:09
matthewlmcclurei'll see if i can reproduce15:10
abentleymatthewlmcclure: When you say they're "missing", what do you mean?  Log doesn't include them?15:12
matthewlmcclureright, log doesn't include them15:12
abentleyStrange that it would do that.  Is there anything significant about the revision where it stops?15:15
matthewlmcclurethe broken branch had a parent in the shared repo, and the last rev in the broken branch is the parent's last rev15:18
abentleyI have trouble imagining how a bug like that could work.  If you can reproduce it, that would be great.15:19
abentleyOh, okay.15:20
abentleylet me see if it could be the reconfiguration to lightweight checkout.15:21
matthewlmcclurethat would be my guess as to when things went wrong15:21
abentleyYeah, that's it.15:23
abentleyIt's not really sensible to convert a branch with unique revisions into a lightweight checkout, because whatever it's a checkout of won't have those revisions.15:24
matthewlmcclureso it's official that i know just enough to be dangerous now15:24
abentleyI'm sorry about this bug.  I'll add a check15:24
abentleyI can help you recover the revisions.15:25
matthewlmcclurei don't actually need them in this case, but thanks for offering15:25
matthewlmcclurehm... actually, i am curious if there's a way to recover a branch from a repo; say, if i had deleted the branch's directory15:27
abentleyYou can create a new branch with the same tip.15:28
abentleyFirst you have to find the revision-id of the branch tip.15:28
abentleyThe heads plugin is useful for this.15:28
matthewlmccluregot it.  thanks15:29
abentleyThen you branch from any branch in the repository, and specify -r revid:15:29
ubotuNew bug: #212853 in bzr "AssertionError: 17 != 18 when trying to comuit to bzr.debian.org" [Undecided,New] https://launchpad.net/bugs/21285315:36
=== weigon__ is now known as weigon
offby1The docs show some examples that use abbreviations for URLs, like "bzr branch m:/cool-trunk16:56
offby1where is that abbreviation format described?16:56
james_woffby1: there's an "m:/" described?16:59
james_wthere's "lp:/" provided by the launchpad plugin that is shipped with bzr.16:59
offby1there's both!17:01
asabilthere is bz-bookmarks17:02
offby1.../doc/en/user-guide/branching_a_project.txt, r3336, line 6017:02
james_woffby1: that's a windows drive, "m:/"17:03
datoright, but check bzr-bookmars as asabil said17:05
datoer, bzr-bookmarks17:05
offby1I also created my local repository by doing "bzr branch lp:bzr"17:07
ubotuNew bug: #212908 in bzr "fetch all from a repo with identical contents fails with pack repos" [High,Triaged] https://launchpad.net/bugs/21290817:31
ubotuNew bug: #212917 in bzr ""make check" got an internal error" [Undecided,New] https://launchpad.net/bugs/21291717:45
=== Verterok is now known as Verterok-laptop
=== lamont` is now known as lamont
ubotuNew bug: #212979 in bzr "trying to do checkout of some django code" [Undecided,New] https://launchpad.net/bugs/21297920:23
nick125good afternoon.20:25
nick125I'm looking for a SCM to integrate into an IDE project that I'm writing, and I've been looking at bazaar as a possible option. The idea is to use a SCM to internally version saves, as well as allowing a user to use an "external" SCM. What I'm looking for is a SCM that will allow me to use a non-standard directory to store the SCM's files, so that I can have two instances of the SCM versioning the same source tree. Can bazaar do that?20:27
nick125I like bazaar since it's written in Python, which will make it easier to integrate into my IDE (since I'm writing it in Python).20:30
ubotuNew bug: #213032 in bzr "allow to change author (name <e-mail>) and description in past commits" [Undecided,New] https://launchpad.net/bugs/21303221:35
CeruleanI'm probably missing something obvious, but I want to branch a repository onto my server22:03
CeruleanI can't access the repo from my server (firewall etc)22:04
Ceruleanso something like bzr push that pushes the files. What can I do?22:04
TFKylenick125: mm, writing an IDE now?22:25
nick125TFKyle: yep22:27
nick125TFKyle: What are you upto these days?22:29
TFKylenick125: looked at crypto/digital signing stuff a while ago, a few days ago I got a fingerprint scanner and made a small thing using pylibusb to access it and get fingerprints from it :)22:30
nick125Sweet, how much did the scanner set you back/22:31
TFKylenick125: ~$50 CAD22:31
nick125That's not bad.22:31
TFKylethe scans seem a bit low quality, dunno what sort of quality the other scanners have though (can create 128x128 images, with a few pixels being blacked out for some reason (think the register values I'm using aren't the most perfect combination though, stole them mostly from the kernel driver (that doesn't compile with newer kernels obviously))22:33
TFKyletried just changing the one required for it to send data, but it seems to produce more heat (or more electricity, not sure), should have a look at what the windows driver does too22:35
nick125TFKyle: I wonder what kind of program you'd use for reverse engineering the windows driver..22:37
TFKylenick125: usbsnoop/snoopy is supposedly pretty good for USB devices (logs the traffic to the USB device)22:37
nick125TFKyle: Aah, fun. I've never tried to reverse enginner anything before.22:40
nick125(Well, least over USB)22:41
lifelesspoolie: up?23:09
lifelessnick125: so, we don't have code in bzrlib to maintain two completely separate trees like you want to; knowing why might help :P23:10
nick125lifeless: Would it be possible to simply use a different directory for .bzr?23:12
nick125lifeless: Also, the reason I want to have two trees is so that my "internal" save bzr tree will not conflict if the user uses bazaar for an external SCM.23:15
asabilnick125: why not simply support bzr alone ? :D23:21
asabilyou can still write repository handlers for other scms ?23:22
nick125asabil: Well, the idea is that I'd integrate really closely to a SCM to keep an internal save revision tree, that way, if you delete a file or something, you can restore it easily. The only problem with using bazaar for the internal SCM is that it might conflict if the user wants to use bazaar for their "external" SCM.23:23
beunohow would I get the list of uncommited changes to a working tree?  I'm getting a bit lost in the code23:26
beunonevermind, got it :)23:31
lifelessnick125: well, you could submit a patch:P.23:32
nick125Is the .bzr path hardcoded into bazaar?23:34
lifelessand yes23:50
lifelesssee, we support svn natively :P23:50
lifelessso there are factory functions to drive a lot of things; you could for instance subclass the stock format and create a .idesave control directory23:51
lifelesswhich would be a bzr one internally but just change the .bzr -> .idesave23:51
nick125lifeless: Hmm, how hard would that be to implement?23:51
lifelessI think the setup.py of the plugin would be longer than the code23:52
nick125ouch :p23:52
lifeless(or you could import bzrlib and register after import, no bzrlib plugin needed then, in which case the code will still be small :P)23:52
nick125I wonder how hard it is to interface with bazaar in Python23:53
* nick125 looks at bzrlib23:53
lifelessas a user of ides from time to time, I would prefer to see ide save stuff to be done as a branch off my actual vcs; but thats me23:53
lifelesspydoctor generates good docs, there is developer docs in doc/en/developer/23:54
lifelessor something like that :)23:54
nick125Hmm...using a branch could be useful.23:54

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