Dev wip1 - Githubissues

l-arnold / tkl-nomadic-odoo

Focused on Flow and Function

Other

4 stars 44 forks source link

Dev wip1 #34

Closed l-arnold closed 9 years ago

l-arnold commented 9 years ago

@DocCyblade How do we merge this manually? Not clear on the conflicts

Seems aparent that editing in "github.com" with the "Default" being different than the branch we (at least I) commonly want to edit is a problem.

Might be best if "dev-wip1" become Default.

Better yet, I start working more directly (SSH somehow). Perhaps Github for Windows ?

l-arnold commented 9 years ago

It appears that there were two Manual updates (trying to second trying to negate the first) on --branch dev conf.d/30-main both of which be removed (and likely source of conflict)

first 5135a5f2b9e5f43efc6c830ae914b49af949aa52 second 5135a5f2b9e5f43efc6c830ae914b49af949aa52

trying to do this in Git Desktop... Will see if it works.

l-arnold commented 9 years ago

Worked through using GIT Desktop. Relatively helpful. ...

But having "build errors" in DEV.
Seems like "make clean" is not as long of a "cleanup" as in dev-wip1. May need to clear the folder and start fresh on this one. Trying dev-wip1 (need to be traveling about now)

This is the command line last lines: fab-chroot build/root.patched --script /turnkey/fab/common/conf/pgsql

set postgres
ls /etc/postgresql/
PGSQL_VER=
CONF_DIR=/etc/postgresql//main
pg_dropcluster --stop main Usage: /usr/bin/pg_dropcluster [--stop] /usr/share/fab/product.mk:476: recipe for target 'build/stamps/root.patched' failed make: *\ [build/stamps/root.patched] Error 1

JedMeister commented 9 years ago

Looks like something is going wrong but it's nothing to do with Odoo build code.

fab-chroot build/root.patched --script /turnkey/fab/common/conf/pgsql means that it was applying the conf script pgsq from common when it errored. So unless you've been editing files in common there is something else going on. Do you have plenty of free space on your TKLDev maching? Or was this posted before you discovered your free space issue?

l-arnold commented 9 years ago

This is after thebfree space issue.

I think was related to my very curiously typing something like chroot or deck... Then restarting. Killing the foder etc. Seems related to some ghost in tkldev around that one branch.

That said, I am.an optimist.

JedMeister commented 9 years ago

My guess is Postgres still running somewhere...