From ced5a6e5b32026dbe9dc7ae7e2c38eb9cb621639 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Aug 2003 22:28:59 +0000
Subject: directory mergin

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@11 07ea20a6-d2c5-0310-9e02-9ef735347d72
---
 test/Makefile | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'test/Makefile')

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$
-- 
cgit