summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-10-07 19:05:00 +0100
committerTom Hacohen <tom@stosb.com>2013-10-07 19:05:00 +0100
commit6f247f634bbc70e5fd4bdf0732c2285f9f4a00b5 (patch)
tree6101a8812df7ca7d45f406ea2f861cdaca7e3d5a
parent9e2209544314b62a399537d652e97801844f4b05 (diff)
Removed all Daniel specific paths.
-rw-r--r--README2
-rw-r--r--filter-efl-cmds4
-rw-r--r--filter-elm-cmds2
-rwxr-xr-xrename_authors.sh2
-rwxr-xr-xrename_authors_manual.sh2
-rw-r--r--update8
6 files changed, 10 insertions, 10 deletions
diff --git a/README b/README
index 29b5080..90f2a9a 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ If you want to migrate a repository to Git:
3* Adjust DEVS_PATH in rename_authors.sh and rename_authors_manual.sh to your setup 3* Adjust DEVS_PATH in rename_authors.sh and rename_authors_manual.sh to your setup
4 4
5* Check out the project - make sure you are checking out the root dir 5* Check out the project - make sure you are checking out the root dir
6> git svn clone --use-log-author svn+ssh://asdfuser@svn.enlightenment.org/var/svn/e/trunk/PROTO/project tmp 6> git svn clone --use-log-author http://svn.enlightenment.org/svn/e/trunk/PROTO/project tmp
7 7
8* Transform the authors 8* Transform the authors
9> git filter-branch -f --env-filter 'eval $(/path/to/migration/rename_authors.sh)' HEAD 9> git filter-branch -f --env-filter 'eval $(/path/to/migration/rename_authors.sh)' HEAD
diff --git a/filter-efl-cmds b/filter-efl-cmds
index 5b09a27..034454c 100644
--- a/filter-efl-cmds
+++ b/filter-efl-cmds
@@ -1,3 +1,3 @@
1git filter-branch -f -d ../ram/filter --prune-empty --tree-filter /home/likewise-open/SERILOCAL/d.willmann/scm/e-playground/..//filter-branch-efl.sh HEAD 1git filter-branch -f -d /tmp/ram/filter --prune-empty --tree-filter "$(pwd)/filter_branch_scripts/filter-branch-efl.sh HEAD
2git filter-branch --prune-empty -f --subdirectory-filter newroot/efl/ 2git filter-branch --prune-empty -f --subdirectory-filter newroot/efl/
3git filter-branch -f --prune-empty --index-filter "$(pwd)/../remove_legacy_dup.sh" b426168d1792e2820eab6479d7027b31092c0467~100..migration/efl-copy-fixup 3git filter-branch -f --prune-empty --index-filter "$(pwd)/remove_legacy_dup.sh" b426168d1792e2820eab6479d7027b31092c0467~100..migration/efl-copy-fixup
diff --git a/filter-elm-cmds b/filter-elm-cmds
index 6873b5f..b0cce3a 100644
--- a/filter-elm-cmds
+++ b/filter-elm-cmds
@@ -1,3 +1,3 @@
1git filter-branch -f -d ../ram/filter --prune-empty --tree-filter /home/likewise-open/SERILOCAL/d.willmann/scm/e-playground/..//filter-branch-elementary.sh 1733d1706d7aebcda2cdd0672b0b930d420abd23^^^^..HEAD 1git filter-branch -f -d /tmp/ram/filter --prune-empty --tree-filter $(pwd)/filter_branch_scripts/filter-branch-elementary.sh 1733d1706d7aebcda2cdd0672b0b930d420abd23^^^^..HEAD
2git filter-branch --prune-empty -f --subdirectory-filter newroot/master/ 2git filter-branch --prune-empty -f --subdirectory-filter newroot/master/
3#branches aswell 3#branches aswell
diff --git a/rename_authors.sh b/rename_authors.sh
index bc92b4e..f8d4815 100755
--- a/rename_authors.sh
+++ b/rename_authors.sh
@@ -2,7 +2,7 @@
2 2
3# Update the committer and author according to the git_authors file. 3# Update the committer and author according to the git_authors file.
4 4
5DEVS_PATH='/home/likewise-open/SERILOCAL/d.willmann/scm/migration/git_authors' 5DEVS_PATH='$(pwd)/git_authors'
6 6
7while read dir 7while read dir
8do 8do
diff --git a/rename_authors_manual.sh b/rename_authors_manual.sh
index 5fdb637..32e4a38 100755
--- a/rename_authors_manual.sh
+++ b/rename_authors_manual.sh
@@ -4,7 +4,7 @@
4# fixing things. 4# fixing things.
5# List of broken committer names is in manual-author-reset 5# List of broken committer names is in manual-author-reset
6 6
7DEVS_PATH='/home/likewise-open/SERILOCAL/d.willmann/scm/migration/manual-author-reset' 7DEVS_PATH='$(pwd)/manual-author-reset'
8 8
9MY_AUTHOR="$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" 9MY_AUTHOR="$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>"
10MY_AUTHOR="$(echo $MY_AUTHOR | tr -d '"[]')" 10MY_AUTHOR="$(echo $MY_AUTHOR | tr -d '"[]')"
diff --git a/update b/update
index 37af480..ee29fe0 100644
--- a/update
+++ b/update
@@ -14,19 +14,19 @@ On the day:
14 14
15Updating a project: 15Updating a project:
16* Check the latest SVN rev imported and clone the branch/trunk from there: 16* Check the latest SVN rev imported and clone the branch/trunk from there:
17> git svn clone -r 83370:HEAD --use-log-author svn+ssh://asdfuser@svn.enlightenment.org/var/svn/e/trunk/efl/ efl-trunk 17> git svn clone -r 83370:HEAD --use-log-author http://svn.enlightenment.org/svn/e/trunk/efl/ efl-trunk
18 18
19* Transform the authors 19* Transform the authors
20> git filter-branch -f --env-filter 'eval $(/home/likewise-open/SERILOCAL/d.willmann/scm/migration/rename_authors.sh)' HEAD 20> git filter-branch -f --env-filter 'eval $(/full/path/here/rename_authors.sh)' HEAD
21 21
22* Attribute Patch by: 22* Attribute Patch by:
23> git filter-branch -f --env-filter 'eval $(/home/likewise-open/SERILOCAL/d.willmann/scm/migration/rename_patch_by.sh)' HEAD 23> git filter-branch -f --env-filter 'eval $(/full/path/here/rename_patch_by.sh)' HEAD
24 24
25* Check if there are any anomalies (picked up through incorrect use of Signed-off-by or From lines) 25* Check if there are any anomalies (picked up through incorrect use of Signed-off-by or From lines)
26> git shortlog -n -s -e 26> git shortlog -n -s -e
27 27
28* Add those authors + email to the manual-reset-author file and reset these 28* Add those authors + email to the manual-reset-author file and reset these
29> git filter-branch -f --env-filter 'eval $(/home/likewise-open/SERILOCAL/d.willmann/scm/migration/rename_authors_manual.sh)' HEAD 29> git filter-branch -f --env-filter 'eval $(/full/path/here/rename_authors_manual.sh)' HEAD
30 30
31* Verify all authors check out okay 31* Verify all authors check out okay
32> git shortlog -n -s -e 32> git shortlog -n -s -e