![]() ![]() P4merge "$BASE" "$MINE" "$THEIRS" "$MERGED"Īgain, assuming you save the above on the PATH as Section of the Red Book had the answer all along, so use that link for more information :)ĭoing the same for a merge is even easier: " Using External Differencing and Merge Tools" This took me quite a while the first time round, reading on various threads, then I found out that the # diff-cmd = diff_program (diff, gdiff, etc.) # Set diff-cmd to the absolute path of your 'diff' program. Then in the subversion config file ( ~/.subversion/config for linux and %appdata%\subversion\config for windows) add in the diff command under the section. Save the above script somewhere on your PATH. P4merge -nl "$LEFT_FILE_DESCR" -nr "$RIGHT_FILE_DESCR" "$LEFT" "$RIGHT" Perforce merge and diff tools so after a bit of searchingĪround now use the following script on my Linux box #!/bin/sh Svk add config/routes.rb config/boot.rb config/environment.rb config/environmentsĬp config/database.yml config/database.To use a specific diff tool from the command line use: Svk add test app Rakefile components README script doc lib public vendor Svk propset svn:ignore '*' tmp/cache tmp/sessions tmp/sockets Svk add -N tmp/cache tmp/sessions tmp/sockets Or, using SVK: svk add -N application_directory Svn add test app Rakefile components migrate README script doc lib public vendor Svn propset svn:ignore "*" tmp/cache tmp/sessions tmp/sockets In the future, this could be done as a single commit something like this: svn add -non-recursive tmp tmp/cache tmp/sessions tmp/sockets Svn commit -m "Add db and config dirs, ignoring database files" Svn add config/routes.rb config/boot.rb config/environment.rb config/environmentsĬp config/database.yml config/database.example Svn propset svn:ignore "database.yml" config Svn commit -m "Initial commit of bulk of Rails application" Svn add test app Rakefile components migrate README script doc lib public # add the rest of the simple files and folders Svn commit -m "Add log directory, ignoring contents" # now do the same for children of the "log" directory Svn commit -m "Ignore files in tmp subdirectories" # this means "ignore everything that matches '*' in the cache directory" # the quote marks are to prevent shell globbing # properties must be set on the parent directory Svn add -non-recursive cache sessions sockets # now a non-recursive add of the tmp directory # but realized it a recursive add wasn't what I wanted When I first did this I preferred to use a different method rather than import/remove/ignore, I chose to selectively add and set the ignore properties so that the ignored files never touched the repository: # first I tried adding the tmp directory Svk propset svn:ignore 'database.yml' config Svk mv config/database.yml config/database.example This is the approach I used in conjunction with SVK as described in " Behaviour-Driven Development with Rails": svk rm log/* Set the svn:ignore property on those files so that they don’t interfere with future check-outs or commits.Remove files from the repository that should be ignored. ![]() The pattern followed in the later article is the following: Instructions can be found here for tracking EdgeRails using Subversion, and here for importing an Rails application into a Subversion repository.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |