Mercurial Mercurial > mercurial / 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>
Fri, 19 Dec 2008 20:58:33 -0600
changeset 7530 3773e510d433
parent 7006 92d44ec32430
child 7657 405cacb06745
permissions -rw-r--r--
resolve: clarify and simplify help
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
7006
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
     2
 
marked working directory as branch q
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
     3
 
reset working directory to branch a
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 
     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 b
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6067
diff changeset 
     6
 
created new head
7006
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
     7
 
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
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 
     8
 
marked working directory as branch c
6815
7d6622eaad08 test-branches: add a test for long branch name (issue 1230)
Patrick Mezard <pmezard@gmail.com>
parents: 6631
diff changeset 
     9
 
marked working directory as branch a branch name much longer than the default justification used by branches
7006
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    10
 
a branch name much longer than the default justification used by branches 7:10ff5895aa57
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    11
 
b                              4:aee39cd168d0
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    12
 
c                              6:589736a22561 (inactive)
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    13
 
a                              5:d8cbc61dbaa6 (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 
    14
 
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 
    15
 
-------
7006
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    16
 
a branch name much longer than the default justification used by branches 7:10ff5895aa57
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    17
 
b                              4:aee39cd168d0
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
7006
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    19
 
changeset:   5:d8cbc61dbaa6
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    20
 
branch:      a
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    21
 
parent:      2:881fe2b92ad0
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    22
 
user:        test
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    23
 
date:        Thu Jan 01 00:00:04 1970 +0000
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    24
 
summary:     Adding b branch head 2
92d44ec32430 branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6815
diff changeset 
    25
 












92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    26


changeset:   2:881fe2b92ad0












92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    27


branch:      a












92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    28


user:        test












92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    29


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












92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    30


summary:     Adding to a branch












92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    31









6067






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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    32


changeset:   1:dd6b440dd85a












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    33


branch:      a












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    34


user:        test












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    35


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




    36


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




    37














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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    38


---- Branch b







7006






92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    39


changeset:   4:aee39cd168d0







6067






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


user:        test












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    42


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




    43


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




    44









7006






92d44ec32430
branch: added more support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6815

diff
changeset




    45


changeset:   3:ac22033332d1







6067






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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    46


branch:      b












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    47


parent:      0:19709c5a4e75












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    48


user:        test












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



Dustin Sallings <dustin@spy.net>


parents: 
4675

diff
changeset




    49


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




    50


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




    51
















mercurial