|Version 9 (modified by elemoine, 3 years ago)|
Develop with sandboxes
MapFish SVN includes a sandbox directory. People registered to the MapFish trac have SVN R/W access to this directory.
- create your own sandbox
svn mkdir http://svn.mapfish.org/svn/mapfish/sandbox/<username>
(obviously, replace <username> with your actual user name)
- copy MapFish HEAD into your sandbox
svn cp http://svn.mapfish.org/svn/mapfish/trunk/MapFish http://svn.mapfish.org/svn/mapfish/sandbox/<username>/MapFish
- go develop cool stuff!
The sandbox directory is checked out in a web directory every half an hour. That web directory is accessible at this URL http://dev.mapfish.org/sandbox/. With that, people will be able to browse your sandbox and see your work at live!
Merge with trunk
Often, you will want to keep your sandbox synchronized with MapFish trunk.
- first get the revision number of your last trunk merge
svn log --stop-on-copy http://svn.mapfish.org/svn/mapfish/sandbox/<username>/MapFish
(when you start, this it is the earliest revision you see. On successive merges it is the revision that resulted from your mast merge (look for the last 'merging from trunk' comment)
r472 | elemoine | 2008-04-29 20:30:50 +0200 (mar, 29 avr 2008) | 2 lines svn merge -r 424:HEAD trunk/MapFish
In this example, <last_merge_rev_num> is 472
cd <local checkout of sandbox> svn merge -r <last_merge_rev_num>:HEAD http://svn.mapfish.org/svn/mapfish/trunk/MapFish .
(you may consider doing svn merge --dry-run first)
svn commit -m "Merging from <last_merge_rev_num> to HEAD"
Create patch against trunk
svn diff --old=http://svn.mapfish.org/svn/mapfish/trunk/MapFish --new=http://svn.mapfish.org/svn/mapfish/sandbox/<username>/MapFish