Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-strict.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 4315 bc6f5a1d8b7b
permissions -rw-r--r--
Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2971
63c3a1921a67 Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     1
 
adding a
63c3a1921a67 Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     2
 
0: a
63c3a1921a67 Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     3
 
hg: unknown command 'an'
63c3a1921a67 Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     4
 
Mercurial Distributed SCM
63c3a1921a67 Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     5
 







4315






bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4014

diff
changeset




     6


basic commands:








2971






63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




     7














63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




     8


 add        add the specified files on the next commit













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




     9


 annotate   show changeset information per file line













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    10


 clone      make a copy of an existing repository













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    11


 commit     commit the specified files or all outstanding changes













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    12


 diff       diff repository (or selected files)













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    13


 export     dump the header and diffs for one or more changesets













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    14


 init       create a new repository in the given directory













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    15


 log        show revision history of entire repository or files








4014






509342f95564
various doc fixes



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2971

diff
changeset




    16


 merge      merge working directory with another revision








2971






63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    17


 parents    show the parents of the working dir or revision













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    18


 pull       pull changes from the specified source













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    19


 push       push changes to the specified destination













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    20


 remove     remove the specified files on the next commit













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    21


 revert     revert files or dirs to their states as of some revision













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    22


 serve      export the repository via HTTP













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    23


 status     show changed files in the working directory








4014






509342f95564
various doc fixes



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2971

diff
changeset




    24


 update     update working directory








4315






bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4014

diff
changeset




    25














bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4014

diff
changeset




    26


use "hg help" for the full list of commands or "hg -v" for details








2971






63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    27


0: a













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    28


% should succeed - up is an alias, not an abbreviation













63c3a1921a67
Add ui.strict config item.



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    29


0 files updated, 0 files merged, 0 files removed, 0 files unresolved















mercurial-crew-with-dirclash