/srv/irclogs.ubuntu.com/2012/11/02/#bzr.txt

mathrick_hiya10:20
mathrick_I'm setting up a workflow for a company that hasn't used any VCS before (ew), and I need to make things simple enough to have them use it10:21
mathrick_one of the things I want to get is to have a "submit" command, which takes changes not present in the submit branch yet, and *merges* them in as a new revision, so that the submit branch, which serves as a central repo / coordination point always receives merges corresponding to logical "features", rather than just having revisions pushed from the dev branches10:23
mathrick_that's both for internal organisation purposes, as well as because they interact with an external SVN repo maintained by a customer; they want the customer to receive changes, but only in coarse "feature" chunks and not the fine-grained revisions the development actually happened in10:25
mathrick_and I want to set it up in a way which doesn't require having two different dev/ and submit/ (to perform the merges in) in addition to bzr://server/repo/central10:27
mathrick_only dev/ and bzr://server/repo/central10:27
mathrick_for that reason I'd like the "submit" tool to do something like create an internal .bzr/branch/submit if it doesn't exist yet, and then use that for merges in a transparent way10:29
mathrick_so, the question: does something comparable exist so that I could set it up with appropriate aliases and plugins, or do I need to cobble up my own plugin for that?10:29
Wiz_KeeDhey guys, what are the graphical methods in which you can view a branch evolution using ubuntu?11:38
Wiz_KeeDthere were two ways and i was using one forgot what the package was called11:38
Wiz_KeeDanyone?11:46
jmlwhat's the fastest way to get the files in the tip of a branch over https? export? branch? checkout? checkout --lightweight?13:16
mathrick_jml: I don't really understand your question. If there's no smart server, then no method is particularly faster than the others, since you still need full history to build the files13:25
mathrick_assuming you mean faster in wallclock time spent on transferring things13:25
mathrick_*in the sense of13:26
jmlmathrick_: yes, faster in that sense.13:27
mathrick_then all should take roughly the same time13:27
mathrick_branch and checkout are identical, except that checkout will automatically push local changes to the parent branch, which doesn't make sense with https13:28
mathrick_I'd suggest plain branch, since that gives you most bang for the same buck. In case you need to do anything more with it, branch will have everything locally already, and the others won't13:29
LeoNerdIf you do anything other than "export" then you'll have a local branch you can update later on, without needing a full pull again13:56
mathrick_with a lightweight checkout it's not really true14:13
mathrick_since it's very little more than just the working tree14:13
mathrick_well, you can update it of course14:13
mathrick_but it needs network access14:13
mathrick_but yes, it will definitely be faster than re-exporting14:14
fullermdI'm not sure about that...14:21
fullermdEspecially over a dumb server.14:22
mathrick_at the very least, it can skip over files that haven't changed14:22
mathrick_bu hmm\14:22
mathrick_you're right, a dumb server probably won't see benefits of a lightweight checkout14:23
fullermdIn theory maybe.  I'm not sure it works out that way in practice.14:23
mathrick_yeah14:23
fullermdEven with a smart server, I'd hesitate at lesat 6 times before even considering a light checkout over anything slower than a 2ms/1gbit pipe.14:23
mathrick_oh it's not that bad14:24
mathrick_I've used lightweight checkouts many times for things like plugins which I don't want to work on14:24
mathrick_even ones with rather extensive history14:24
mathrick_btw, any comments on my question re: "bzr submit"?14:28
jelmermathrick_: I think I might have missed the question14:29
mathrick_oh, lemme pastebin it14:30
mathrick_http://pastebin.com/p3YAVsCv14:30
mathrick_jelmer: ^14:30
mathrick_if there is some other workflow which'd make it easy that I haven't considered, I'm of course also interested14:31
jelmermathrick_: I don't think such a command exists at the moment.14:33
mathrick_I see14:34
mathrick_I think it'd be a worthwile addition14:34
mathrick_it seems sensible to me to use merges as a history organisation tool14:34
jelmerpatches welcome? :)14:34
mathrick_writing as we speak? :)14:34
jelmerheh, OK14:40
LarstiQjml: hmm, my guess would be export, for a one off18:01
=== yofel_ is now known as yofel
felipecwhat is wrong with this? http://pastie.org/517361820:30
felipecI get ImportError: No module named fastimport20:30
felipecbut it's there20:30
fullermdYou sure you're looking for the right one?  The bzr 'fastimport' plugin relies on the python 'fastimport' library.20:42
felipecyeah... just realized that20:44
felipecwhat is the status of the bzr <-> git compatibility?21:01
felipecI see quite a few plugins, but I hear a lot of them don't work reliably21:01
fullermdI'm not really the one to ask, since I've never used any of them.21:11
fullermdMy impression is that the various fast-import solutions work fine for one-way conversions/mirrors/etc.21:11
fullermdAnd bzr-git does a reasonably good job with caveats for the "use bzr as a git client" sort of uses.21:12
felipecfullermd: you think fastimport is reliable?21:21
fullermdI've not heard about any major issues with it.  Which, to be sure, proves little, but...21:22
fullermdIt probably won't much help you if you're trying to _work_ in both VCSen.  But for working in one and maintaining a copy in the other, I'm given to understand it does fine.21:22
fullermd(or one-time conversion of course, though that's just a degenerate case)21:23
felipecbranch.iter_merge_sorted_revisions(0, -1) the same as branch.iter_merge_sorted_revisions(None, None)?21:57
=== iBasic is now known as BasicOSX
felipecer: 1, -121:58
felipecor rather: builtins._get_revision_range([0, None], ...22:01
felipecs/0/1/22:01
felipecI guess rev1 = RevisionSpec.from_string(str(tip)), RevisionSpec.from_string(None)22:15
=== yofel_ is now known as yofel
felipecwow, the git-remote-bzr in bzr-git is in really bad shape23:08
jelmerfelipec: in what way?23:30
felipecjelmer: many ways... but for starters I can't push23:31
jelmerfelipec: FWIW git-remote-bzr in bzr-git is experimental23:33
jelmerfelipec: how does push break?23:34
felipecjelmer: let me try again23:35
felipecjelmer: but also, it's not tracking the properly... a 'master' branch should appear in git23:36
felipecI'm writing a simple git-remote-bzr that already does that23:36
jelmerfelipec: I think it already does that, at least in trunk23:41
jelmerfelipec: either way, patches welcome :-)23:41
felipecjelmer: the code is too complicated and it's doing many things that are not neccessary23:44
felipecjelmer: http://pastie.org/517439623:46
felipecalso, the push seems to be fetching _all the objects_ again, which is certainly not needed23:47
jelmerfelipec: ah, that's happening because you're pushing into a bound branch I think23:47
felipecjelmer: what is that?23:47
felipecjelmer: in my remote-bzr I'm able to push to the same branch just fine23:48
felipecalthough only once23:48
jelmerfelipec: what is your remote-bzr ?23:49
felipecjelmer: http://pastie.org/517441523:53
jelmerfelipec: ah, so that's essentially the same thing as git-bzr is doing?23:53
felipecjelmer: yeah, but git-bzr doesn't use git's remote helper functionality23:55
jelmerfelipec: I'm pretty sure at least one of its incarnations does23:55
felipecjelmer: you mean bzr-git?23:57
jelmerfelipec: no, git-bzr23:57
jelmer(I'm involved in bzr-git/bzr-fastimport)23:57
felipecand actually I'm seeing the same issue mentioned in git-bzr-hg: AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'23:58
felipecwell, I don't see it here: https://github.com/pieter/git-bzr, or here https://github.com/termie/git-bzr-ng23:58

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