couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sebastian Cohnen <sebastiancoh...@googlemail.com>
Subject Re: Source tree refactoring - TESTERS NEEDED
Date Thu, 09 Dec 2010 08:35:41 GMT
Hey Paul,

./srcmv.py does throw an error at me, b/c a patch could not be applied:

error: patch failed: test/etap/060-kt-merging.t:14
error: test/etap/060-kt-merging.t: patch does not apply
Patch failed at 0002 fix-etap-tests
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Traceback (most recent call last):
  File "./srcmv.py", line 340, in <module>
    main()
  File "./srcmv.py", line 331, in main
    git_restore()
  File "./srcmv.py", line 290, in git_restore
    run("git am %s/*.patch" % PATCH_DIR)
  File "./srcmv.py", line 38, in run
    raise RuntimeError("Command failed: %s" % cmd)
RuntimeError: Command failed: git am /Users/basti/Documents/src/sandbox/couchdb-srcmv/couchdb.patches/*.patch

here is the full output: http://friendpaste.com/73PhLSNcRH64dQVDg7B9fr


On 04.12.2010, at 23:43, Paul Davis wrote:

> Heya,
> 
> I've just finished getting the refactoring of the source tree to be
> more compliant with OTP source code layout. This is a pretty big move
> so I'd like at least a couple other people to test this. If you have a
> platform that is not OS X or Ubuntu, consider this an extra special
> request so that we have confidence that I haven't broken one of the
> uncommon platforms.
> 
> The repo for the scripts and patches are at [1]. You should be able to
> get a fully refactored couch with:
> 
>    $ git clone git://github.com/davisp/couchdb-srcmv.git
>    $ cd couchdb-srcmv
>    $ ./srcmv.py
> 
> Once you have that, there's a couchdb.git subdirectory that is a
> checkout of the entire source tree. Once there, you can build and test
> couchdb as per normal. Also, I would appreciate anyone that goes the
> extra effort and runs the install into a tmp location and runs the
> Futon tests on the installed version to make sure everything still
> passes.
> 
> Ideally I'd like to get this into trunk fairly shortly so that it has
> as long as possible to sit in trunk before we cut 1.2.x. Let me know
> if there are any comments or complaints on it.
> 
> Paul Davis
> 
> [1] https://github.com/davisp/couchdb-srcmv


Mime
View raw message