WordPress.org
Get WordPress

Plugin Directory

Changeset 1399271


Ignore:
Timestamp:
04/19/2016 11:41:36 AM (10 years ago)
Author:
robmcvey
Message:

Updating readme with git svn dcommit and tag info

File:
1 edited

Legend:

Unmodified
Added
Removed

  • copify/trunk/README.md

    r1399270 r1399271  
    2727We want to use git for version control, but WordPress uses SVN. Urgh.
    2828
    29 So, initialise the SVN repo locally using `git svn`:
    30 
    31 `git svn init --stdlayout https://plugins.svn.wordpress.org/copify`
    32 
    33 Development can be carried out on any branch other than `svn` then when we want to publish our changes to WordPress, we merge using the `--squash` option;
    34 
    35 `git checkout svn && git merge --squash myWorkingBranch`
    36 
    37 The `svn` branch can now be commited with a single commit - important for SVN to play nice;
    38 
    39 `git commit -a`
     29So, clone/initialize the SVN repo locally using `git svn`:
    4030
    4131```bash
    42 1 Squashed commit of the following:
    43 2
    44 3 commit bc314d4aec1ce5a69eaea06e601943f0cfe06eaf
    45 4 Merge: b09a9b4 17a8ef7
    46 5 Author: Rob McVey <robmcvey@gmail.com>
    47 6 Date:   Wed Oct 8 13:24:53 2014 +0100
    48 
    49 ...
     32$ git svn init --stdlayout https://plugins.svn.wordpress.org/copify
     33$ git svn fetch
    5034```
    5135
    52 We can then publish using `dcommit`:
     36Make changes and commit as usual using `git commit`, then diffs and new versions can be pushed to SVN with;
    5337
    5438```bash
    55 git svn dcommit
    56 Committing to http://plugins.svn.wordpress.org/copify/trunk ...
    57     M   README.md
    58 Committed r1003783
    59     M   README.md
    60 r1003783 = 3a7bb6a653e0eba4a382c6bccdd95267aa3657b3 (refs/remotes/trunk)
    61 
    62 ...
     39$ git svn dcommit
     40$ git svn tag 1.1.1
    6341```
Note: See TracChangeset for help on using the changeset viewer.