Mercurial Mercurial > hg / 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.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 13 Mar 2008 19:50:03 -0300
changeset 6245 0d0939b2d272
parent 6067 57c1a7052982
child 6336 4b0c9c674707
permissions -rw-r--r--
setup.py: skip inotify if there's no inotify_add_watch Debian Etch doesn't include a sys/inotify.h header, which makes it impossible to compile _inotify.c, making hg uninstallable. The cc.has_function() method is implemented by trying to compile a simple C program. Since there's no redirection involved all error messages are sent to the terminal. This is not particularly pretty but at least it allows the installation to complete.
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
 
marked working directory as 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 
     2
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
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
 
marked working directory as 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 
     4
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
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
 
marked working directory as 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 
     6
 
c                              5:5ca481e59b8c
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
 
a                              1:dd6b440dd85a
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
 
b                              4:22df7444f7c1 (inactive)
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
 
default                        0:19709c5a4e75 (inactive)
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
 
-------
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
 
c                              5:5ca481e59b8c
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
 
a                              1:dd6b440dd85a
6067
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    13
 
--- Branch a
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    14
 
changeset:   1:dd6b440dd85a
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    15
 
branch:      a
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    16
 
user:        test
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    17
 
date:        Thu Jan 01 00:00:01 1970 +0000
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    18
 
summary:     Adding a branch
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    19
 












57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    20


---- Branch b













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    21


changeset:   4:22df7444f7c1













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    22


branch:      b













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    23


parent:      2:ac22033332d1













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    24


user:        test













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    25


date:        Thu Jan 01 00:00:04 1970 +0000













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    26


summary:     Adding b branch head 2













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    27














57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    28


changeset:   3:aee39cd168d0













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    29


branch:      b













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    30


user:        test













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    31


date:        Thu Jan 01 00:00:03 1970 +0000













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    32


summary:     Adding b branch head 1













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    33














57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    34


changeset:   2:ac22033332d1













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    35


branch:      b













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    36


parent:      0:19709c5a4e75













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    37


user:        test













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    38


date:        Thu Jan 01 00:00:02 1970 +0000













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    39


summary:     Adding b branch













57c1a7052982
Option to log to only show changesets within a specified branch.



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    40
















Mercurial