[00:48] <_kbulgrien> me wonders if anyone has a good quick link to some description of how to let branches diverge. I have several branches that mostly follow each other, but I don't know how to skip over some changes when pulling, etc. [00:54] No such thing as that; any change implies all its ancestors. [00:56] <_kbulgrien> um. well am I asking the wrong question then, because it seems a given that branches should be able to be different. [00:58] Sure, but it happens by one going off one way and the other not (generally going off another). [00:59] Can't happen that you take change n+1 from some branch without getting n. Unless you add a n+2 that's (~n), say. But then the other side will get that when they sync you, and it gets messier from there. [00:59] Nobody can do that sort of thing except darcs, since they don't have ordered changes, and are messy from the getgo ;p [01:00] <_kbulgrien> so once you diverge you can never merge from the source again without becoming a clone of it again? [01:03] Mmm. You can't merge without sorta undiverging, since that's what merge _is_; an elimination of divergeance. [01:03] Once you merge, you've got everything they do. Of course, you'll still have extra stuff, so you could say you're diverged from them, in that you're now a proper superset. [01:04] But then when they merge you, they've got everything you have and now they're a superset. [01:07] <_kbulgrien> I'm thinking that mostly I want to follow a source, but I want to be able to let certain files diverge. It seems like that should be possible. I guess I have a broken concept of what DVCS was supposed to allow. [01:08] By "let" you mean "make changes to them versus what upstream has". So you wind up with always a superset of them. [01:08] (well, right after you merge anyway. You wind up both diverged in between while they move ahead between your merges, but...) [01:08] <_kbulgrien> yes [01:09] <_kbulgrien> Well, not necessarily superset I guess. I want to track changes in this file, but where I branched from has a different one. I'm good with getting the one from upstream, but I'd like to maintain my own history downstream on that one file. [01:10] Well, that _is_ a superset. You've got every change upstream does, plus some of your own. [01:11] <_kbulgrien> Ok, yeah. [01:23] <_kbulgrien> Is there a way in the VCS to send patches to them without them having to take all my changes? [01:32] <_kbulgrien> I'm sort of thinking along the lines that in CVS, one can selectively merge on a file by file basis without having to merge the branches in entirety. Perhaps the language is different between CVS and DVCS... (shrug) I don't know how to translate that to Bazaar. [01:35] well of course, you can not accept changes [01:35] probably making life hard for yourself, though [01:37] I want to write a post_change_branch_tip hook that updates itself. So I figure I can have the hook check out the new version of the branch and copy itself into the plugins directory. [01:38] Also, it has configuration, so I want to copy a new version of the branch.conf into place. [01:39] It doesn't look like the bzr developers particularly want me poking around here, though. The only way I've found to discover the path beneath which I'll find branch.conf is `params.branch.bzrdir.transport.base [01:39] And that's not even a real filename, but a file:// uri. [01:39] Am I barking up the wrong tree? [01:52] _kbulgrien: Not as VCS data, no. You can send patches of course; whether they'll apply will depend. And they won't have any relation to your changes, so you may get some odd conflicts when you merge their application of them. [01:54] Gah.... filtered-143716140:///~/highscores/.bzr/ is not a very nice path :( [01:55] Surely there must be some way to find the branch on the filesystem? [01:59] <_kbulgrien> so then I guess I'm asking if the vcs facilitates that sort of thing... upstream agrees my change is good to incorporate, so I send them some kind of spec that they can use to pull the changes from my branch without a merge, or do I have to do the old-style here's my set of patch files, apply it to your branch please? [02:14] Well, the ideal is that you make a branch of _just_ their stuff, plus that change of yours. Once its entwined with other stuff you don't want to send, you're down to the old-style patch sending. Or using darcs ;p [07:28] exarkun: I think you're indeed barking up the wrong tree [07:29] exarkun: avoid the direct file access and just use the API: branch.lock_write() ; conf = branch.get_config.stack() ; conf.get() ; conf.set() ; conf.remove() ; branch.unlock() [07:30] err, conf = branch.get_config_stack() [07:31] o/ vila [07:31] poolie: hey :) [11:46] vila: Thanks. [14:33] hello , I have a project on launchpad and i use bazaar and there is urgent merge propsal and i have no access except to windows PC can any one help me do the merge by installing bzr on windows [14:33] i have installed bzr using cygwin !! but it fails to merge ? [14:36] unclear what 'failes to merge' means [14:40] Value "/etc/ssl/certs/ca-certificates.crt" is not valid for "ssl.ca_certs" [14:40] No valid trusted SSL CA certificates file set. See 'bzr help ssl.ca_certs' for more information on setting trusted CAs. [14:40] See `bzr help ssl.ca_certs` for how to specify trusted CAcertificates. [14:40] Pass -Ossl.cert_reqs=none to disable certificate verification entirely. [14:40] bzr: ERROR: _ssl.c:323: No root certificates specified for verification of other-side certificates. [14:40] this is error message [14:53] fix your bzr config file === yofel_ is now known as yofel