[05:52] <Wiz_KeeD> Hello fellas
[05:52] <Wiz_KeeD> small question, I have pulled a branch from a server and updated the config file to connect to my mysql database with user and password
[05:52] <Wiz_KeeD> but I want to be able to pull all the changes except that file
[05:53] <Wiz_KeeD> so the password stays the same
[05:54] <fullermd> As in "I keep pull'ing upstream stuff as an otherwise-unchanged local copy without making local commits"?
[06:04] <Wiz_KeeD> yeah something like that
[06:04] <Wiz_KeeD> I don't make the changes locally
[06:05] <Wiz_KeeD> just pull and want to keep the config file
[06:05] <Wiz_KeeD> I could just bzr ignore that file?
[06:05] <fullermd> No, ignore doesn't do anything like that.
[06:05] <fullermd> But pull always merges forward uncommitted changes, so I don't see that you need to do anything.
[06:23] <Wiz_KeeD> i usually do overwrite, but if in this case it does not work merging would mean showing both sides of the code
[06:23] <Wiz_KeeD> and I have to delete every time, messed up
[06:23] <fullermd> As in pull --overwrite?  As a regular thing?
[06:25] <Wiz_KeeD> Yeah, to have the fresh code without what I might have accidentaly overwritten
[06:26] <fullermd> Well, make up your mind, do you wanna make local changes or not?  ;p
[06:27] <fullermd> But no, there's no way I know of to express --overwrite-oh-but-not-this-part
[06:27] <fullermd> Doubly so because it's really sorta peripheral what --overwrite does to the WT anyway.
=== mars_ is now known as mars
[20:05] <exarkun> I can't push my branch: bzr: ERROR: Option 1,2 is not defined while expanding "lp:~exarkun/pyopenssl/tlsv1_{1,2}".
[20:07] <exarkun> Can I work-around that somehow or do I have to pick a different branch name?
[20:07] <mwhudson> you can't call a branch that on lp
[20:07] <mwhudson> but that error is pretty special
[20:08] <mwhudson> is it coming from curl or somethign?
[20:08] <mwhudson> no, that makes no sense
[20:08] <exarkun>   File "/usr/lib/python2.7/dist-packages/bzrlib/config.py", line 3758, in _expand_options_in_string
[20:08] <exarkun>     raise errors.ExpandingUnknownOption(name, string)
[20:08] <exarkun> ExpandingUnknownOption: Option 1,2 is not defined while expanding "lp:~exarkun/pyopenssl/tlsv1_{1,2}".
[20:09] <exarkun> with `return self.get_config_stack().get('push_location')` up above it on the stack
[20:09] <mwhudson> huh huh
[20:09] <mwhudson> yeah, it's something in the bzr config machinery
[20:11] <mwhudson> anyway, if you made it work client side, pretty sure lp would tell you to FOAD so try another name i guess
[20:12] <exarkun> Yea okay.  Thanks.
[20:14] <mwhudson> valid_branch_name_pattern = re.compile(r"^(?i)[a-z0-9][a-z0-9+\.\-@_]*\Z")
[20:15]  * mwhudson remembers with amusement changing the $ to the \Z at the end in a mad panic
[20:16] <exarkun> huh I had to look up \Z just now and got the impression it was the same as $...
[20:16] <exarkun> Oh... something about newlines...
[20:16] <exarkun> nice
[20:17]  * exarkun imagines every regexp he's ever seen in a Python program is probably has one more bug than he previously realized
[20:21] <mwhudson> yes, someone somehow managed to create a branch called "trunk\n"