gmane.comp.version-control.bazaar-ng.general

Re: CVS migration help

Jelmer Vernooij — 2008-10-07T15:22:58

Am Dienstag, den 07.10.2008, 17:03 +0200 schrieb Thomas Manson: The problem seems to be that one of the characters in your CVS repository is not valid as UTF8 character. Did you specify the locale in which the filenames are encoded explicitly somehow? Git does not have this problem, since it does not interpret any of the filenames you store in it. This has advantages (conversion can't fail since you're not doing conversion at at all), but it also has disadvantages - checking out the repository on hosts with a different encoding breaks the filenames. Cheers, Jelmer

Re: CVS migration help

Thomas Manson — 2008-10-07T15:03:08

# (Be in -*- python -*- mode.) # # ==================================================================== # Copyright (c) 2006-2007 CollabNet. All rights reserved. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms # are also available at http://subversion.tigris.org/license-1.html. # If newer versions of this license are posted there, you may use a # newer version instead, at your option. # # This software consists of voluntary contributions made by many # individuals. For exact contribution history, see the revision # history and logs, available at http://cvs2svn.tigris.org/. # ==================================================================== # ##################### # ## PLEASE READ ME! ## # ##################### # # This is a template for an options file that can be used to configure # cvs2svn. Many options do not have defaults, so it is easier to copy # this file

Re: CVS migration help

Thomas Manson — 2008-10-07T15:04:42

btw... bzr 1.3.1 Maybe that's the issue... the version on ubuntu is very old considering 1.8 rc1 has been announced... On Tue, Oct 7, 2008 at 17:03, Thomas Manson gmail.com>wrote:

Re: [MERGE] Fix two bugs in api versioning support - 279447 and 279451

John Arbash Meinel — 2008-10-07T14:39:42

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Robert Collins wrote: BB:tweak I'm a bit curious how the requested range works with how we increment the ranges. Regardless, I think if it gets bzr-svn to use it, good enough. I like the change to plugin loading messages. I don't know if bzr-svn could to it more as-needed rather than on every command. bzrtools did manage to do that most of the time. === modified file 'bzrlib/api.py' - --- bzrlib/api.py2007-06-26 08:52:20 +0000 +++ bzrlib/api.py2008-10-07 04:51:25 +0000 < at >< at > -80,3 +80,24 < at >< at > minimum = get_minimum_api_version(object_with_api) if wanted_api < minimum or wanted_api > current: raise IncompatibleAPI(object_with_api, wanted_api, minimum, current) + +def require_any_api(object_with_api, wanted_api_list): ^- two spaces here: + details. + :param wanted_api: A list of API versions, any of which being available is + sufficent. + :return None: + :raises IncompatibleAPI: When the wanted_api is not supported by +

Re: Project Kenai: vote for Bazaar VCS option

Alfonso de la Guarda — 2008-10-07T13:01:24

Hello, Git remains first, we need more votes. Saludos, -------------------------------- Alfonso de la Guarda COS www.cosperu.com alfonsodg.blogspot.com alfonsodg.wordpress.com Telef. 997550914 On Tue, Oct 7, 2008 at 04:15, Ben Finney benfinney.id.au> wrote:

Re: CVS migration help

Michael Haggerty — 2008-10-07T10:41:32

No conversion tool that is based on cvsps will be able to do a truly reliable job of migrating from CVS. cvsps, which was written for another purpose, simply is not robust enough and does not emit enough information for a complete conversion. I gave many concrete examples of its shortcomings on the Mercurial mailing list [1]. Deducing a project's history from CVS's incomplete records is a very tricky thing; cvs2svn's feature list [2] will give you an idea of the kinds of things an industrial-strength converter needs to handle. cvs2svn deduces the CVS changesets itself, using a much more robust algorithm than that used by cvsps. (The main disadvantage of cvs2svn is that it can only be used for one-time conversions, not for tracking a live CVS repository incrementally.) cvs2svn/cvs2git can create output in git-fast-import format [3], which should also be readable by the bzr fast-import tool. It hasn't gotten much testing in "cvs2bzr" mode, but given that 90% of the job is inferring CVS's history, it sho

Re: bzr 1.8rc1 released

Alexander Belchenko — 2008-10-07T10:05:18

Martin Pool пишет: > bzr 1.8rc1 2008-10-07 > --------------------- > > Bazaar 1.8 includes several fixes that improve working tree performance, > display of revision logs, and merges. We've also fixed, and the bzr > testsuite now passes on OS X and Python 2.6, and almost completely passes > on Windows. The smartserver code has gained several bug fixes and > performance improvements, and can now run server-side hooks within an http > server. > > CHANGES: > [...] > > * ``bzrlib._dirstate_helpers_c.pyx`` does not compile correctly with > Pyrex 0.9.4.1 (it generates C code which causes segfaults). We > explicitly blacklist that version of the compiler for that > extension. Packaged versions will include .c files created with > pyrex >= 0.9.6 so it doesn't effect releases, only users running > from the source tree. (John Arbash Meinel, #276868) ``bzrlib._dirstate_helpers_c.pyx`` cannot be compiled with MSVC even with newer Pyrex: https://bugs.launchp

Re: bzr 1.8rc1 released

Alexander Belchenko — 2008-10-07T10:04:13

Martin Pool пишет: [...] ``bzrlib._dirstate_helpers_c.pyx`` cannot be compiled with MSVC even with newer Pyrex: https://bugs.launchpad.net/bugs/277484

Project Kenai: vote for Bazaar VCS option

Ben Finney — 2008-10-07T09:15:05

Howdy all, Sun's “Project Kenai” is another software hosting site started recently. Currently, on their feedback site that allows voting on suggestions, they have one that's a must-have for me: Add Bazaar as a VCS option Please visit and vote to let Sun know that Bazaar hosting would make Kenai more attractive for you.

Re: [MERGE] Fix two bugs in api versioning support - 279447 and 279451

Alexander Belchenko — 2008-10-07T08:27:48

Robert Collins пишет: In docstring: + :return None: should be :return: None

Re: CVS to Bazaar using cvsps-import

Daniel Watkins — 2008-10-07T07:57:12

Hi Thomas, On Mon, 2008-10-06 at 20:31 +0200, Thomas Manson wrote: Well, there's not really a 'right' way to use bzr. What you probably want, to mirror the CVS workflow most closely, is a branch on your Linux server at home, which you then checkout[0] wherever you want to work on it. This will require you to have those branches up-to-date whenever you want to commit to them, as with CVS. There are other ways to work, but you can investigate those while using this one, as Bazaar is extremely flexible in the workflow it allows. Dan [Footnote 0: `bzr checkout `]

Re: [MERGE] Fix two bugs in api versioning support - 279447 and 279451

Bundle Buggy — 2008-10-07T07:49:10

Bundle Buggy has detected this merge request. For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1223365713.9015.123.camel%40lifeless-64%3E Project: Bazaar

[MERGE] Fix two bugs in api versioning support - 279447 and 279451

Robert Collins — 2008-10-07T07:48:33

[Success!] [merge][#279381] correct calls to readdir from pyrex

Bundle Buggy — 2008-10-07T07:02:01

This change has been merged. Previous status: Approved For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ce01316480810062029v75a37f54qb79c168f3b81cab2%40mail.gmail.com%3E Project: Bazaar

Re: [merge] don't treat enoent from readdir as indicating eof

Andrew Bennetts — 2008-10-07T06:34:30

I think your theory that it's due to 279381 makes sense: Python triggers a lot of ENOENTs in its import machinery (just look at the strace log in that bug; if it wasn't for the failed attempt to rewrite a root-owned pyc file the last error would have been ENOENT). So I'm in favour of merging this. bb:approve -Andrew.

Re: [merge] don't treat enoent from readdir as indicating eof

Bundle Buggy — 2008-10-07T05:18:29

Bundle Buggy has detected this merge request. For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ce01316480810062217y541e3f1blcb998299876e9317%40mail.gmail.com%3E Project: Bazaar

[merge] don't treat enoent from readdir as indicating eof

Martin Pool — 2008-10-07T05:17:28

As a follow on from my previous patch, this makes ENOENT from readdir just be treated as a regular error. I can't find any clear indication on the web of what would be the correct way to handle it, and it seems unlikely that it will be raised. I think if we were seeing it before, it probably was because of bug 279381. It seems to me that unless we specifically know that it indicates the end of the directory, it's unsafe to treat it as such. If we merge this change and it causes a real exception, we can find out more about situations where it does occur. === modified file 'bzrlib/_readdir_pyx.pyx' --- bzrlib/_readdir_pyx.pyx 2008-10-07 04:39:43 +0000 +++ bzrlib/_readdir_pyx.pyx 2008-10-07 05:13:20 +0000 < at >< at > -301,15 +301,10 < at >< at > else: break if entry == NULL: - if errno == ENOTDIR or errno == ENOENT or errno == 0: + if errno == ENOTDIR or errno == 0: # We see ENOTDIR at the end of a normal directory.

Re: [merge][#279381] correct calls to readdir from pyrex

Andrew Bennetts — 2008-10-07T04:27:25

Andrew Bennetts has voted approve. Status is now: Approved Comment: "errno = 0;" You don't need a semi-colon in pyrex :) Otherwise this looks good to me. For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ce01316480810062029v75a37f54qb79c168f3b81cab2%40mail.gmail.com%3E Project: Bazaar

Re: [merge][#279381] correct calls to readdir from pyrex

Bundle Buggy — 2008-10-07T03:29:59

Bundle Buggy has detected this merge request. For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ce01316480810062029v75a37f54qb79c168f3b81cab2%40mail.gmail.com%3E Project: Bazaar

[merge][#279381] correct calls to readdir from pyrex

Martin Pool — 2008-10-07T03:29:02

This fixes https://bugs.edge.launchpad.net/bzr/+bug/279381 plus one nearby bonus bug. If the system call is interrupted with eintr or eagain, the previous code would incorrectly assume that it was at the end of the directory, but in fact it should continue reading. It's probably unlikely this would be hit, but if it was then it might cause us to think some files had disappeared. (There might have been a bug report of this.)

Re: bazaar for documents -- facets

Ben Finney — 2008-10-07T00:49:16

I routinely use Bazaar for this purpose; it works well. The above two seem to apply just as well to programs as documents. To avoid duplication of the document (and the inevitable unintented divergence), this is best done by rendering both forms from a third, source form of the document. For example by maintaining the document as reStructuredText, and rendering HTML and LaTeX from that via an automated process. This sounds like the salesperson wants to branch from the existing document. I do this fairly often with Bazaar and find branches work fine. The branch metaphor fits better, then. So O, A, and B are all good candidates for Bazaar breanches with O as the common ancestor.