git confilict with revisioned .pyc files
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
juju-core |
New
|
Undecided
|
Unassigned |
Bug Description
Occasionally juju will run into a git conflict due to revisioning temporary binary files like .pyc files and requires manual intervention.
Can juju be made to ignore binary temporary files?
Example:
2014-04-30 15:16:18 INFO juju deployer.go:150 worker/
2014-04-30 15:16:18 DEBUG juju.worker.
2014-04-30 15:16:18 DEBUG juju.worker.
2014-04-30 15:16:18 INFO juju deployer.go:170 worker/
2014-04-30 15:16:21 ERROR juju git.go:188 worker/
path: /var/lib/
args: []string{"pull", "/var/lib/
From /var/lib/
* branch HEAD -> FETCH_HEAD
warning: Cannot merge binary files: lib/charmhelper
warning: Cannot merge binary files: lib/charmhelper
warning: Cannot merge binary files: lib/charmhelper
CONFLICT (modify/delete): lib/charmhelper
Auto-merging lib/charmhelper
CONFLICT (content): Merge conflict in lib/charmhelper
Auto-merging lib/charmhelper
CONFLICT (content): Merge conflict in lib/charmhelper
Auto-merging lib/charmhelper
CONFLICT (content): Merge conflict in lib/charmhelper
CONFLICT (modify/delete): lib/charmhelper
CONFLICT (modify/delete): lib/charmhelper
Automatic merge failed; fix conflicts and then commit the result.
2014-04-30 15:16:22 DEBUG juju.worker.
2014-04-30 15:16:22 WARNING juju deployer.go:99 worker/
2014-04-30 15:16:22 DEBUG juju.worker.uniter modes.go:423 ModeUpgrading local:precise/
2014-04-30 15:16:22 INFO juju.worker.uniter modes.go:421 ModeConflicted starting
2014-04-30 15:16:22 DEBUG juju.worker.
2014-04-30 15:16:22 DEBUG juju.worker.
2014-04-30 15:16:22 DEBUG juju.worker.
On the host
root@juju-
diff --cc lib/charmhelper
index a06f33b,
Binary files differ
diff --cc lib/charmhelper
index 905fd13,
Binary files differ
diff --cc lib/charmhelper
index db84204,
Binary files differ
* Unmerged path lib/charmhelper
* Unmerged path lib/charmhelper
* Unmerged path lib/charmhelper
tags: | added: canonical-webops |