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 Matt Mackall <mpm@selenic.com>
Wed, 11 Jun 2008 17:49:27 -0500
changeset 6660 5fb42da426cd
parent 6631 a2b13cac0922
child 6815 7d6622eaad08
permissions -rw-r--r--
Merge with crew
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
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6067
diff changeset 
     4
 
created new head
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 
     5
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6067
diff changeset 
     6
 
created new head
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 
     7
 
marked working directory as branch c
6631
a2b13cac0922 Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6336
diff changeset 
     8
 
marked working directory as branch d
a2b13cac0922 Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6336
diff changeset 
     9
 
d                              6:9c581c5ff105
a2b13cac0922 Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6336
diff changeset 
    10
 
b                              4:22df7444f7c1
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 
    11
 
a                              1:dd6b440dd85a
6631
a2b13cac0922 Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6336
diff changeset 
    12
 
c                              5:5ca481e59b8c (inactive)
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 
    13
 
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 
    14
 
-------
6631
a2b13cac0922 Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6336
diff changeset 
    15
 
d                              6:9c581c5ff105
a2b13cac0922 Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6336
diff changeset 
    16
 
b                              4:22df7444f7c1
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 
    17
 
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 
    18
 
--- Branch a
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    19
 
changeset:   1:dd6b440dd85a
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    20
 
branch:      a
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    21
 
user:        test
57c1a7052982 Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents: 4675
diff changeset 
    22
 
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 
    23
 
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 
    24
 












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    25


---- Branch b













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    26


changeset:   4:22df7444f7c1













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    27


branch:      b













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    28


parent:      2:ac22033332d1













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    29


user:        test













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    30


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




    31


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




    32














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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    33


changeset:   3:aee39cd168d0













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    34


branch:      b













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    35


user:        test













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    36


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




    37


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




    38














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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    39


changeset:   2:ac22033332d1













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    40


branch:      b













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    41


parent:      0:19709c5a4e75













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    42


user:        test













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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    43


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




    44


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




    45
















Mercurial