|
142 | 142 | src: src/*.h |
143 | 143 | repo-path: cpputest/cpputest |
144 | 144 |
|
145 | | -.. scenario-include:: ../features/fetch-file-pattern-git.feature |
| 145 | +.. tabs:: |
| 146 | +
|
| 147 | + .. tab:: Git |
| 148 | +
|
| 149 | + .. scenario-include:: ../features/fetch-file-pattern-git.feature |
| 150 | +
|
| 151 | + .. tab:: SVN |
| 152 | +
|
| 153 | + .. scenario-include:: ../features/fetch-file-pattern-svn.feature |
146 | 154 |
|
147 | 155 | Ignore |
148 | 156 | ###### |
|
172 | 180 | And the ignores will be applied *after* the ``src:`` pattern was applied. |
173 | 181 | License files will never be excluded, since you likely shouldn't be doing that. |
174 | 182 |
|
175 | | -.. scenario-include:: ../features/fetch-with-ignore-git.feature |
| 183 | +.. tabs:: |
| 184 | +
|
| 185 | + .. tab:: Git |
| 186 | +
|
| 187 | + .. scenario-include:: ../features/fetch-with-ignore-git.feature |
| 188 | +
|
| 189 | + .. tab:: SVN |
| 190 | +
|
| 191 | + .. scenario-include:: ../features/fetch-with-ignore-svn.feature |
176 | 192 |
|
177 | 193 | VCS type |
178 | 194 | ######## |
|
226 | 242 | repo-path: cpputest/cpputest |
227 | 243 | patch: local_changes.patch |
228 | 244 |
|
229 | | -The patch can be generated using the *Dfetch* :ref:`Diff` command. |
230 | | -Alternately the patch can be generated manually as such. Note that it should be *relative*. |
| 245 | +The patch should be generated using the *Dfetch* :ref:`Diff` command. |
| 246 | +Alternately the patch can be generated manually as such. |
| 247 | +Note that the patch should be *relative* to the projects root. |
| 248 | +
|
| 249 | +.. tabs:: |
| 250 | +
|
| 251 | + .. tab:: Git |
| 252 | +
|
| 253 | + .. code-block:: sh |
| 254 | +
|
| 255 | + git diff --relative=path/to/project HEAD > my_patch.patch |
| 256 | +
|
| 257 | + For more details see the `git-diff <https://git-scm.com/docs/git-diff>`_ documentation. |
231 | 258 |
|
232 | | -.. code-block:: sh |
| 259 | + .. scenario-include:: ../features/diff-in-git.feature |
233 | 260 |
|
234 | | - # For git repo's |
235 | | - git diff --relative=path/to/project HEAD > my_patch.patch |
| 261 | + .. tab:: SVN |
236 | 262 |
|
237 | | - # For svn repo's |
238 | | - svn diff -r HEAD path/to/my_project > my_patch.patch |
| 263 | + .. code-block:: sh |
239 | 264 |
|
240 | | -For more details see the `git-diff`_ or `svn-diff`_ documentation. |
| 265 | + svn diff -r HEAD path/to/my_project > my_patch.patch |
241 | 266 |
|
242 | | -.. _`git-diff`: https://git-scm.com/docs/git-diff |
243 | | -.. _`svn-diff`: http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.diff.html |
| 267 | + For more details see the `svn-diff <http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.diff.html>`_ documentation. |
244 | 268 |
|
245 | | -.. scenario-include:: ../features/diff-in-git.feature |
| 269 | + .. scenario-include:: ../features/diff-in-svn.feature |
246 | 270 |
|
247 | 271 | """ |
248 | 272 |
|
|
0 commit comments