From 008b28e0f4c48de8d740c51c053020d1a36315bf Mon Sep 17 00:00:00 2001
From: Raja R Harinath <harinath@hurrynot.org>
Date: Thu, 22 Jul 2010 18:32:21 +0530
Subject: Provide a way to merge repositories

Suppose you have multiple repositories in SVN that you want to merge into
a single one in GIT, it can get very messy to handle all the special-case
rules.

Instead, we introduce a new "forwarding repository" concept, which looks like

  repository subordinate
	repository unified
	prefix foo/
  end repository

This forwards all commits on the "subordinate" SVN tree to the "unified" GIT
tree, with each file prefixed with "foo/".
---
 src/ruleparser.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/ruleparser.h')

diff --git a/src/ruleparser.h b/src/ruleparser.h
index 8d0fcb2..95a508f 100644
--- a/src/ruleparser.h
+++ b/src/ruleparser.h
@@ -36,6 +36,9 @@ public:
         QList<Branch> branches;
         int lineNumber;
 
+	QString forwardTo;
+	QString prefix;
+
         Repository() : lineNumber(0) { }
     };
 
-- 
cgit v1.2.1