~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security

« back to all changes in this revision

Viewing changes to debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-10-04 08:27:01 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
new upstream point release (closes: #445188).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
From f2dfc68fac1caf8fa917f5bf0f00550769b46adc Mon Sep 17 00:00:00 2001
2
 
From: Gerrit Pape <pape@smarden.org>
3
 
Date: Mon, 18 Jun 2007 21:50:21 +0000
4
 
Subject: [PATCH] git-svn: trailing slash in prefix is mandatory with --branches/-b
5
 
 
6
 
Make clear in the documentation that when using --branches/-b and
7
 
--prefix with 'init', the prefix must include a trailing slash.
8
 
This matches the actual behavior of git-svn, e.g.:
9
 
 
10
 
 $ git svn init -Ttrunk -treleases -bbranches --prefix xxx \
11
 
     http://svn.sacredchao.net/svn/quodlibet/
12
 
 --prefix='xxx' must have a trailing slash '/'
13
 
 $
14
 
 
15
 
This was noticed by R. Vanicat and reported through
16
 
 http://bugs.debian.org/429443
17
 
 
18
 
Signed-off-by: Gerrit Pape <pape@smarden.org>
19
 
---
20
 
 Documentation/git-svn.txt |    7 ++++---
21
 
 1 files changed, 4 insertions(+), 3 deletions(-)
22
 
 
23
 
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
24
 
index c0d7d95..0a210e4 100644
25
 
--- a/Documentation/git-svn.txt
26
 
+++ b/Documentation/git-svn.txt
27
 
@@ -66,9 +66,10 @@ COMMANDS
28
 
        to the names of remotes if trunk/branches/tags are
29
 
        specified.  The prefix does not automatically include a
30
 
        trailing slash, so be sure you include one in the
31
 
-       argument if that is what you want.  This is useful if
32
 
-       you wish to track multiple projects that share a common
33
 
-       repository.
34
 
+       argument if that is what you want.  If --branches/-b is
35
 
+       specified, the prefix must include a trailing slash.
36
 
+       Setting a prefix is useful if you wish to track multiple
37
 
+       projects that share a common repository.
38
 
 
39
 
 'fetch'::
40
 
        Fetch unfetched revisions from the Subversion remote we are
41
 
1.5.2.3
42