diff options
| author | Lennart Poettering <lennart@poettering.net> | 2003-08-28 22:28:59 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2003-08-28 22:28:59 +0000 |
| commit | ced5a6e5b32026dbe9dc7ae7e2c38eb9cb621639 (patch) | |
| tree | 381d52b03eece0f507d7dbec22a9ee8078ba0627 | |
| parent | 38cea8764bd4302bfa6f16b086b04dfa25be344b (diff) | |
directory mergin
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@11 07ea20a6-d2c5-0310-9e02-9ef735347d72
| -rw-r--r-- | doc/todo.txt | 32 | ||||
| -rw-r--r-- | test/Makefile | 24 |
2 files changed, 37 insertions, 19 deletions
diff --git a/doc/todo.txt b/doc/todo.txt index 0bd0835..622ea0b 100644 --- a/doc/todo.txt +++ b/doc/todo.txt @@ -1,16 +1,20 @@ -1. merge/makepatch DONE -2. gzip -3. url merges -4. better usage info on --help -5. documentation/man pages -6. stat() before and after md5 as consistency check -7. md5 before delete/replace/link -8. mmap usage in package.c -9. Warn if hostname != origin -10. Recursive directory creation -11. Locking/Atomicity -12. Prune empty directories -13. Handle conflicts -14. -q mode +- merge/makepatch DONE +- Mode -T DONE +- Recursive directory creation DONE +- Prune empty directories DONE +- Handle conflicts +- stat() before and after md5 as consistency check DONE +- better usage info on --help +- documentation/man pages +- package.c rewrite: add progressive, mmap, sendfile, gzip support, atomicity +- -q mode +- url merges +- bi-directory merges +- md5 before delete/replace/link +- Warn if hostname != origin +- some more asserts +- check of non-static symbols +- PATH_MAX or PATH_MAX+1? +- explicit link or copy $Id$ diff --git a/test/Makefile b/test/Makefile index 344a559..491c59a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,21 +4,35 @@ ifdef VERBOSE VERBOSE=-v endif +ARGS=-T --output-directory=extract -opatch --show-deleted --show-times --prune-empty + %: @mkdir -p rep1 rep2 - $(SYREP) $(VERBOSE) --output-directory=extract -opatch --show-deleted --show-times --$@ rep1 rep2 + $(SYREP) $(VERBOSE) $(ARGS) --$@ rep1 rep2 all: update merge: @echo "Merging rep1 into rep2" - $(SYREP) --merge rep1 rep2 + $(SYREP) $(ARGS) --merge rep1 rep2 @echo "Merging rep2 into rep1" - $(SYREP) --merge rep2 rep1 + $(SYREP) $(ARGS) --merge rep2 rep1 + +mergepatch: + @echo "*** Creating patch rep1 against rep2 ***" + $(SYREP) $(ARGS) --makepatch rep1 rep2 + @echo "*** Merging patch into rep2 ***" + $(SYREP) $(ARGS) --merge patch rep2 + @echo "*** Creating patch rep2 against rep1 ***" + $(SYREP) $(ARGS) --makepatch rep2 rep1 + @echo "*** Merging patch into rep1 ***" + $(SYREP) $(ARGS) --merge patch rep1 clean: mrproper: - rm -rf rep1/.syrep rep2/.syrep + rm -rf rep?/.syrep* + +.PHONY: all merge clean mrproper mergepatch -.PHONY: all merge clean mrproper +# $Id$ |