[PATCH 3/3] Permit directories ending in *.d or *.i

Goffredo Baroncelli kreijack at aliceposta.it
Thu Jul 14 16:40:55 CDT 2005


# HG changeset patch
# User kreijack at inwind.REMOVEME.it
# Node ID bcdb3d62a4da86e90730998fe64f74cada4caf9b
# Parent  f72b48cab3bd9c8be58277af75066be69f1d5476
[PATCH 3/3] Permit directories ending in *.d or *.i

With this patches, mercurial stores the directories adding a '.dir' as postfix, so the
conflicts are avoided; this patch, update the test

diff -r f72b48cab3bd -r bcdb3d62a4da tests/test-help.out
--- a/tests/test-help.out       Thu Jul 14 21:32:17 2005
+++ b/tests/test-help.out       Thu Jul 14 21:33:21 2005
@@ -1,37 +1,39 @@
 basic hg commands (use "hg help -v" for more):

- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff working directory (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
- log        show the revision history of the repository or a single file
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- revert     revert modified files or dirs back to their unmodified states
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update or merge working directory
+ add           add the specified files on the next commit
+ annotate      show changeset information per file line
+ clone         make a copy of an existing repository
+ commit        commit the specified files or all outstanding changes
+ diff          diff working directory (or selected files)
+ export        dump the header and diffs for one or more changesets
+ init          create a new repository in the current directory
+ log           show the revision history of the repository or a single file
+ pull          pull changes from the specified source
+ push          push changes to the specified destination
+ remove        remove the specified files on the next commit
+ repoupgrade   upgrade the repository revision
+ revert        revert modified files or dirs back to their unmodified states
+ serve         export the repository via HTTP
+ status        show changed files in the working directory
+ update        update or merge working directory
 basic hg commands (use "hg help -v" for more):

- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff working directory (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
- log        show the revision history of the repository or a single file
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- revert     revert modified files or dirs back to their unmodified states
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update or merge working directory
+ add           add the specified files on the next commit
+ annotate      show changeset information per file line
+ clone         make a copy of an existing repository
+ commit        commit the specified files or all outstanding changes
+ diff          diff working directory (or selected files)
+ export        dump the header and diffs for one or more changesets
+ init          create a new repository in the current directory
+ log           show the revision history of the repository or a single file
+ pull          pull changes from the specified source
+ push          push changes to the specified destination
+ remove        remove the specified files on the next commit
+ repoupgrade   upgrade the repository revision
+ revert        revert modified files or dirs back to their unmodified states
+ serve         export the repository via HTTP
+ status        show changed files in the working directory
+ update        update or merge working directory
 hg add: option -h not recognized
 hg add [files]

@@ -50,18 +52,19 @@
 hg: unknown command 'commands'
 basic hg commands (use "hg help -v" for more):

- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff working directory (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
- log        show the revision history of the repository or a single file
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- revert     revert modified files or dirs back to their unmodified states
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update or merge working directory
+ add           add the specified files on the next commit
+ annotate      show changeset information per file line
+ clone         make a copy of an existing repository
+ commit        commit the specified files or all outstanding changes
+ diff          diff working directory (or selected files)
+ export        dump the header and diffs for one or more changesets
+ init          create a new repository in the current directory
+ log           show the revision history of the repository or a single file
+ pull          pull changes from the specified source
+ push          push changes to the specified destination
+ remove        remove the specified files on the next commit
+ repoupgrade   upgrade the repository revision
+ revert        revert modified files or dirs back to their unmodified states
+ serve         export the repository via HTTP
+ status        show changed files in the working directory
+ update        update or merge working directory
diff -r f72b48cab3bd -r bcdb3d62a4da tests/test-hup.out
--- a/tests/test-hup.out        Thu Jul 14 21:32:17 2005
+++ b/tests/test-hup.out        Thu Jul 14 21:33:21 2005
@@ -8,3 +8,4 @@
 00changelog.i
 data
 undo.dirstate
+version
-- 
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack at inwind DOT it>
Key fingerprint = CE3C 7E01 6782 30A3 5B87  87C0 BB86 505C 6B2A CFF9


More information about the Mercurial mailing list