/stdhome : revision 36

To get this branch, use:

bzr branch
http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/walker/conflict.py

Committer: Tim Marston
Date: 2014-04-18 14:41:07 UTC
Revision ID: tim@ed.am-20140418144107-rl879gdqybbc6ria

moved config to its own file and read-in ignore lists

files removed:
dev

dev/dev

dev/reset

dev/todo.org

lib/stdhome/command/add.py

lib/stdhome/command/stage_add.py

lib/stdhome/command/stage_commit.py

lib/stdhome/command/stage_status.py

files renamed:
lib/stdhome/vcs/brz.py => lib/stdhome/vcs/bzr.py

VERSION => version

files modified:
.bzrignore

configure.ac

lib/stdhome/Makefile.am

lib/stdhome/command/command.py

lib/stdhome/command/diff.py

lib/stdhome/command/init.py

lib/stdhome/command/resolve.py

lib/stdhome/command/revert.py

lib/stdhome/command/stage_revert.py

lib/stdhome/command/status.py

lib/stdhome/command/update.py

lib/stdhome/config.py

lib/stdhome/deployment.py

lib/stdhome/file_matcher.py

lib/stdhome/program.py

lib/stdhome/repo.py

lib/stdhome/the.py

lib/stdhome/util.py

lib/stdhome/vcs/vcs.py

lib/stdhome/walker/conflict.py

lib/stdhome/walker/copy_base.py

lib/stdhome/walker/copy_in.py

lib/stdhome/walker/copy_out.py

lib/stdhome/walker/status.py

lib/stdhome/walker/walker.py

src/stdhome.in

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict.py

import filecmp, os

from .walker import Walker

from walker import Walker

import stdhome.the as the