Rev 451: Convert mapping text to LaTeX. in file:///home/jelmer/bzr-svn/0.3/
Jelmer Vernooij
jelmer at samba.org
Wed May 16 19:26:13 BST 2007
At file:///home/jelmer/bzr-svn/0.3/
------------------------------------------------------------
revno: 451
revision-id: jelmer at samba.org-20070516182612-ax0t4hcgd8jp0eww
parent: jelmer at samba.org-20070516181831-j2ep0mpdhgmxv0eg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-05-16 19:26:12 +0100
message:
Convert mapping text to LaTeX.
modified:
mapping.txt mapping.txt-20060625151311-9ghaqrm71ajq593n-1
=== modified file 'mapping.txt'
--- a/mapping.txt 2007-01-01 21:49:06 +0000
+++ b/mapping.txt 2007-05-16 18:26:12 +0000
@@ -4,37 +4,41 @@
Jelmer Vernooij <jelmer at samba.org>, June 2006.
Updated October 2006.
-== Branch paths ==
+============
+Branch paths
+============
It is hard to know, given a SVN URL, to figure out what branch a particular
file is in. Other then the convention that branches are named 'trunk' and
-'branches/*', there is no way to automatically find out what a branch is.
+'branches/\*', there is no way to automatically find out what a branch is.
Finding out what a branch is and what is not is done by a BranchingScheme
implementation. At the moment, the following branching schemes are available:
- * NoBranchingScheme: The top-level directory in the repository is a branch.
- (consequence of this is that there is only one branch total)
-
- * TrunkBranchingScheme: There is a directory structure with 'trunk',
- 'branches', and 'tags' directories as common in Subversion-based projects.
- These directories can be nested (e.g. subproject1/trunk) inside the
- repository. The level of nesting is stored.
-
- * ListBranchingScheme: There is a list of branches. This branching
- scheme is present in the code, but is never used automatically (yet).
+- NoBranchingScheme: The top-level directory in the repository is a branch.
+ (consequence of this is that there is only one branch total)
+
+- TrunkBranchingScheme: There is a directory structure with 'trunk',
+ 'branches', and 'tags' directories as common in Subversion-based projects.
+ These directories can be nested (e.g. subproject1/trunk) inside the
+ repository. The level of nesting is stored.
+
+- ListBranchingScheme: There is a list of branches. This branching
+ scheme is present in the code, but is never used automatically (yet).
The branching scheme can be explicitly specified or automatically guessed.
The guessing algorithm currently works as follows and is based on paths
relative to the repository root:
- * Look for 'trunk', 'branches' or 'tags' inside the path - if found,
- create a TrunkBranchingScheme with the found level of nesting.
+- Look for 'trunk', 'branches' or 'tags' inside the path - if found,
+ create a TrunkBranchingScheme with the found level of nesting.
- * Assume NoBranchingScheme
+- Assume NoBranchingScheme
NEXT VERSION: Allow specifying the branching scheme in ~/.bazaar/locations.conf.
-== Revision ids ==
+============
+Revision ids
+============
An easy way to generate globally unique and reproducible revision ids is to
simply combine the repositories UUID and commit revision number.
@@ -44,9 +48,7 @@
including the branch path (trunk, branches/SAMBA_4_0, etc) in the
revision-id. Example revision id:
-{{{
-svn-v2:14323 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-trunk
-}}}
+``svn-v2:14323 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-trunk``
The version number is used to distinguish between versions of the mapping
between Bazaar and Subversion. The mapping will change when previously
@@ -61,11 +63,11 @@
and whitespace characters are all urlencoded. Example revision id for
branches/foobranch:
-{{{
-svn-v2:14323 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2ffoobranch
-}}}
+``svn-v2:14323 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2ffoobranch``
-== File ids ==
+========
+File ids
+========
Subversion does not use file ids. It is not possible to know whether a file in
revision X and a file in revision Y are the same without traversing over all
@@ -73,13 +75,13 @@
File ids use the following syntax:
-svn-v<MAPPING_VERSION>:<REVNO>@<UUID>-<BRANCHPATH>-<PATH>
+``svn-v<MAPPING_VERSION>:<REVNO>@<UUID>-<BRANCHPATH>-<PATH>``
Since / is forbidden in file ids, the '/', '-', '%' and all whitespace
characters are urlencoded.
Alternatively, these file ids can be mapped to more specific file ids. Such
-a map should be stored in the `bzr:file-ids' property that is set on the
+a map should be stored in the 'bzr:file-ids' property that is set on the
branch path.
The bzr:file-ids property should contain a list of mappings. Entries are
@@ -112,7 +114,9 @@
NEXT VERSION: Special rules are applied to make sure that renames are tracked.
-== Properties ==
+==========
+Properties
+==========
SVN allows setting properties on versioned files and also interprets several
of these properties.
@@ -127,7 +131,9 @@
"svk:merge" is understood and set where possible.
-== Ancestry Information ==
+====================
+Ancestry Information
+====================
Ancestry in Subversion is linear. Most revisions have just one parent. Files
can be copied, moved or merged from other branches, which can result in partial merges
@@ -153,21 +159,32 @@
'bzr:merge' didn't, the diff in 'svk:merge' is also used to obtain the
parents of a commit.
-This means svk and bzr _should be_ interoperable. However, there are no tests
+This means svk and bzr *should be* interoperable. However, there are no tests
for this yet.
-== Revision properties ==
+===================
+Revision properties
+===================
Bazaar revision properties are stored in the file properties of the
branch path in Subversion. Their names are prefixed with "bzr:revprop:"
-== Signatures ==
+==========
+Signatures
+==========
NEXT VERSION: GPG Signatures for commits will be stored in the SVN revision property 'bzr:gpg-signature'.
-= Revisions =
+=========
+Revisions
+=========
Revision 1 was the original version of this document.
Revision 2 enforces UTF-8-valid characters for everything except file
contents.
+
+=======
+Authors
+=======
+Jelmer Vernooij <jelmer at samba.org>
More information about the bazaar-commits
mailing list