Show More
@@ -86,7 +86,7 b' def convert(ui, src, dest=None, revmapfi' | |||||
86 |
|
86 | |||
87 | rename path/to/source path/to/destination |
|
87 | rename path/to/source path/to/destination | |
88 |
|
88 | |||
89 |
Comment lines start with '#'. A specifi |
|
89 | Comment lines start with '#'. A specified path matches if it | |
90 | equals the full relative name of a file or one of its parent |
|
90 | equals the full relative name of a file or one of its parent | |
91 | directories. The 'include' or 'exclude' directive with the longest |
|
91 | directories. The 'include' or 'exclude' directive with the longest | |
92 | matching path applies, so line order does not matter. |
|
92 | matching path applies, so line order does not matter. | |
@@ -96,8 +96,8 b' def convert(ui, src, dest=None, revmapfi' | |||||
96 | exclusion of all other files and directories not explicitly |
|
96 | exclusion of all other files and directories not explicitly | |
97 | included. The 'exclude' directive causes files or directories to |
|
97 | included. The 'exclude' directive causes files or directories to | |
98 | be omitted. The 'rename' directive renames a file or directory if |
|
98 | be omitted. The 'rename' directive renames a file or directory if | |
99 |
is converted. To rename from a subdirectory into the root of |
|
99 | it is converted. To rename from a subdirectory into the root of | |
100 | repository, use '.' as the path to rename to. |
|
100 | the repository, use '.' as the path to rename to. | |
101 |
|
101 | |||
102 | The splicemap is a file that allows insertion of synthetic |
|
102 | The splicemap is a file that allows insertion of synthetic | |
103 | history, letting you specify the parents of a revision. This is |
|
103 | history, letting you specify the parents of a revision. This is |
@@ -16,7 +16,7 b' Branch' | |||||
16 | a remote repository, since new heads may be created by these |
|
16 | a remote repository, since new heads may be created by these | |
17 | operations. Note that the term branch can also be used informally |
|
17 | operations. Note that the term branch can also be used informally | |
18 | to describe a development process in which certain development is |
|
18 | to describe a development process in which certain development is | |
19 | done independently of other development.This is sometimes done |
|
19 | done independently of other development. This is sometimes done | |
20 | explicitly with a named branch, but it can also be done locally, |
|
20 | explicitly with a named branch, but it can also be done locally, | |
21 | using bookmarks or clones and anonymous branches. |
|
21 | using bookmarks or clones and anonymous branches. | |
22 |
|
22 |
@@ -115,7 +115,7 b' class transaction(object):' | |||||
115 | def release(self): |
|
115 | def release(self): | |
116 | if self.count > 0: |
|
116 | if self.count > 0: | |
117 | self.usages -= 1 |
|
117 | self.usages -= 1 | |
118 |
# |
|
118 | # if the transaction scopes are left without being closed, fail | |
119 | if self.count > 0 and self.usages == 0: |
|
119 | if self.count > 0 and self.usages == 0: | |
120 | self._abort() |
|
120 | self._abort() | |
121 |
|
121 |
@@ -65,7 +65,7 b' convert a foreign SCM repository to a Me' | |||||
65 |
|
65 | |||
66 | rename path/to/source path/to/destination |
|
66 | rename path/to/source path/to/destination | |
67 |
|
67 | |||
68 |
Comment lines start with '#'. A specifi |
|
68 | Comment lines start with '#'. A specified path matches if it equals the | |
69 | full relative name of a file or one of its parent directories. The |
|
69 | full relative name of a file or one of its parent directories. The | |
70 | 'include' or 'exclude' directive with the longest matching path applies, |
|
70 | 'include' or 'exclude' directive with the longest matching path applies, | |
71 | so line order does not matter. |
|
71 | so line order does not matter. | |
@@ -74,7 +74,7 b' convert a foreign SCM repository to a Me' | |||||
74 | be included in the destination repository, and the exclusion of all other |
|
74 | be included in the destination repository, and the exclusion of all other | |
75 | files and directories not explicitly included. The 'exclude' directive |
|
75 | files and directories not explicitly included. The 'exclude' directive | |
76 | causes files or directories to be omitted. The 'rename' directive renames |
|
76 | causes files or directories to be omitted. The 'rename' directive renames | |
77 | a file or directory if is converted. To rename from a subdirectory into |
|
77 | a file or directory if it is converted. To rename from a subdirectory into | |
78 | the root of the repository, use '.' as the path to rename to. |
|
78 | the root of the repository, use '.' as the path to rename to. | |
79 |
|
79 | |||
80 | The splicemap is a file that allows insertion of synthetic history, |
|
80 | The splicemap is a file that allows insertion of synthetic history, |
General Comments 0
You need to be logged in to leave comments.
Login now