Hi, I've been trying to use the instructions on http://www.filesystems.org/unionfs-git.html to easily keep up to date with the latest version of the unionfs source.
Its not working so well, when i do a git-pull to update to the latest version, it fails with merge errors. First time this happened i assumed it was my own fault, because i had made some local modifications. But now I get the same problem with an untouched tree i git-cloned a few days ago... Any idea whats going on? Simon Sasburg
output of git pull:
$ git pull remote: Generating pack... remote: Done counting 824 objects. remote: Result has 805 objects. remote: Deltifying 805 objects... remote: 100% (805/805) done Unpacking 805 objects remote: Total 805 (delta 648), reused 795 (delta 638) 100% (805/805) done * refs/heads/origin: not updating to non-fast forward branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jsipek/unionfs old...new: b00aa44...2ae5b18 Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with 2ae5b18acf33f679c72dd3a4bf6d0071a73bd1c3 Merging: b00aa44 Unionfs: Remove unnecessary BUG_ON in unionfs_follow_link 2ae5b18 [PATCH] unionfs: make functions static found 1 common ancestor(s): 1895486 Linus 2.6.22-rc6 Auto-merging fs/ecryptfs/inode.c CONFLICT (add/add): File fs/unionfs/lookup.c added non-identically in both branches. Adding as fs/unionfs/lookup.c~HEAD and fs/unionfs/lookup.c~2ae5b18acf33f679c72dd3a4bf6d0071a73bd1c3 instead. CONFLICT (add/add): File fs/unionfs/mmap.c added non-identically in both branches. Adding as fs/unionfs/mmap.c~HEAD and fs/unionfs/mmap.c~2ae5b18acf33f679c72dd3a4bf6d0071a73bd1c3 instead. CONFLICT (add/add): File fs/unionfs/union.h added non-identically in both branches. Adding as fs/unionfs/union.h~HEAD and fs/unionfs/union.h~2ae5b18acf33f679c72dd3a4bf6d0071a73bd1c3 instead. Automatic merge failed; fix conflicts and then commit the result. _______________________________________________ unionfs mailing list: http://unionfs.filesystems.org/ [email protected] http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs
