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-branches
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 4675 6858a7477a5e
permissions -rwxr-xr-x
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4675
6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     1
 
#!/bin/sh
6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset 
     2
 












6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     3


hg init a













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     4


cd a













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     5


echo 'root' >root













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     6


hg add root













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     7


hg commit -d '0 0' -u test -m "Adding root node"













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     8














6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




     9


echo 'a' >a













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    10


hg add a













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    11


hg branch a













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    12


hg commit -d '1 0' -u test -m "Adding a branch"













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    13














6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    14


hg update -C 0













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    15


echo 'b' >b













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    16


hg add b













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    17


hg branch b













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    18


hg commit -d '2 0' -u test -m "Adding b branch"













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    19














6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    20


echo 'bh1' >bh1













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    21


hg add bh1













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    22


hg commit -d '3 0' -u test -m "Adding b branch head 1"













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    23














6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    24


hg update -C 2













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    25


echo 'bh2' >bh2













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    26


hg add bh2













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    27


hg commit -d '4 0' -u test -m "Adding b branch head 2"













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    28














6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    29


echo 'c' >c













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    30


hg add c













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    31


hg branch c













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    32


hg commit -d '5 0' -u test -m "Adding c branch"













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    33














6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    34


hg branches













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    35


echo '-------'













6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.



Eric Hopper <hopper@omnifarious.org>


parents: 

diff
changeset




    36


hg branches -a















mercurial-crew-with-dirclash