[01:34] what's the easirest way to upgrade bzr on windows? [02:11] Noldorin: run the newer installer AIUI [02:12] jelmer: ping (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574603) [02:12] Debian bug 574603 in python-testtools "testtools: Does not have a Vcs-Bzr header set" [Minor,Open] [02:12] lifeless, AIUI? [02:12] Noldorin: As I Understand It [02:12] lifeless, oh yes. this confirms what i thought...just install over the previous installation [02:12] thanks. === medberry is now known as med_out === r0bby is now known as robbyoconnor === gour is now known as croat === croat is now known as gour === maxb_ is now known as maxb === lifeless_ is now known as lifeless [16:06] hi [16:07] hello [16:09] I'm fixing a bug in version-info (it does not handle dotted revnos) [16:10] now, the problem is with the python format, revision_id_to_dotted_revno returns a tupple, should I keep it as is? [16:10] or convert it to a string? or keep using a fixnum for simple revnos? [16:10] (to avoid changing the API for most use cases) [16:14] Hmm. Interesting conundrum [16:17] I don't think there's an obvious right answer here [16:19] Worth posing the question on the mailing list, I think [16:19] yeah, thanks [16:19] I could be convinced that either approach was plausible [16:20] I think keeping the tupple makes more sense, it's simpler, and the format you need to go back for example to a revision id when using the bzrlib API [17:05] /set plugins.var.perl.buffers.color_hotlist_message lightred [19:42] errr [19:43] So apparently the maverick elilo branch has the tag 3.10-1ubuntu1 set on two different revisions simulataneously [19:43] ?! [19:46] or not, it's just stderr / stdout interleaving in a very odd way to mess with my mind === yofel_ is now known as yofel === jelmer is now known as Guest81401 [22:44] hi [22:47] I'm planning to use a DVCS as a client for SVN I investigate over git-svn, but many says that it's unusable if you commit over a bit branch that is a clone of svn, this is because of some problem of git-svn, does bazaar address those issues ? [22:47] things like rebase or merge in git-svn screw up the SVN repository [22:48] commit without git-svn-id doesn't know where to be placed [22:53] visik7: AFAIK, bzr handles working with svn really well [22:54] visik7: the person to ask for complete detail though is jelmer [22:54] but there are probably many others that have used SVN with BZR a lot [22:54] but I'm not one of them [22:56] I would offer this solution for a supplier to avoid them to do slow integration phases [22:56] but I need to investigate more [22:57] or probably the best way is to tell them to publish their code and I merge in my local branch and then push into svn === jelmer is now known as Guest92963 === cinerama_ is now known as cinerama [23:55] hiya, I have a bound branch that somehow managed to diverge from the remote location, so now the (unintended) local commits are pending as merges [23:56] how can I flatten the history and rebase them onto the proper tip instead?