Skip to content

Commit

Permalink
open-osd: svn_fetch3: Add comments on how to use
Browse files Browse the repository at this point in the history
This scripts assumes a specific git situation to
work best. Comment on that.

(After a long time I forget what to do so better write it
 down)

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
  • Loading branch information
Boaz Harrosh committed Apr 26, 2009
1 parent 73d7f53 commit 34a9b27
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions svn_fetch3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# from svn into current git HEAD. Note that this will always succeed and no
# merge conflicts will ever exist since git-checkout files are over written by
# new svn files
#
# For clean merge-less pull start with: (No additional open-osd code)
# []$ git checkout osc
# []$ git cherry-pick FOR_SVN_FETCH3
# (Above is for missing .gitignore, without it will not work)
# osc branch now holds the new patches, cherry-rebase over master

commit_txt=`pwd`/commit.txt
start_rev=695
Expand Down

0 comments on commit 34a9b27

Please sign in to comment.