| author | Christian Ebert <blacktrash@gmx.net> |
| Fri, 04 Dec 2009 12:48:17 +0100 | |
| changeset 10006 | 9c142ed9c405 |
| parent 9189 | c2041f80f22a |
| child 10345 | bc2866bdf3e0 |
| child 10417 | 58e040c51231 |
| permissions | -rw-r--r-- |
|
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 |
|
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
52 |
---- going to test branch closing |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
53 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
54 |
b 4:aee39cd168d0 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
55 |
c 6:589736a22561 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
56 |
a 5:d8cbc61dbaa6 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
57 |
default 0:19709c5a4e75 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
58 |
2 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
59 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
60 |
created new head |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
61 |
b 10:bfbe841b666e |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
62 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
63 |
c 6:589736a22561 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
64 |
a 5:d8cbc61dbaa6 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
65 |
default 0:19709c5a4e75 (inactive) |
|
9189
c2041f80f22a
heads: more clarity for --closed
Matt Mackall <mpm@selenic.com>
parents:
8991
diff
changeset
|
66 |
abort: you must specify a branch to use --closed |
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
67 |
changeset: 10:bfbe841b666e |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
68 |
branch: b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
69 |
tag: tip |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
70 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
71 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
72 |
summary: adding another cset to branch b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
73 |
|
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
74 |
changeset: 8:eebb944467c9 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
75 |
branch: b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
76 |
parent: 4:aee39cd168d0 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
77 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
78 |
date: Thu Jan 01 00:00:07 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
79 |
summary: adding cset to branch b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
80 |
|
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
81 |
changeset: 7:10ff5895aa57 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
82 |
branch: a branch name much longer than the default justification used by branches |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
83 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
84 |
date: Thu Jan 01 00:00:06 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
85 |
summary: Adding d branch |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
86 |
|
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
87 |
b 8:eebb944467c9 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
88 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
89 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
90 |
--- b branch should be inactive |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
91 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
8991
7e0b31dfc66f
branches: add --closed flag for consistency with heads
Matt Mackall <mpm@selenic.com>
parents:
8796
diff
changeset
|
92 |
c 6:589736a22561 (inactive) |
|
7e0b31dfc66f
branches: add --closed flag for consistency with heads
Matt Mackall <mpm@selenic.com>
parents:
8796
diff
changeset
|
93 |
a 5:d8cbc61dbaa6 (inactive) |
|
7e0b31dfc66f
branches: add --closed flag for consistency with heads
Matt Mackall <mpm@selenic.com>
parents:
8796
diff
changeset
|
94 |
default 0:19709c5a4e75 (inactive) |
|
7e0b31dfc66f
branches: add --closed flag for consistency with heads
Matt Mackall <mpm@selenic.com>
parents:
8796
diff
changeset
|
95 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
96 |
b 12:2da6583810df (closed) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
97 |
c 6:589736a22561 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
98 |
a 5:d8cbc61dbaa6 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
99 |
default 0:19709c5a4e75 (inactive) |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
100 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
8796
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
101 |
no open branch heads on branch b |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
102 |
changeset: 12:2da6583810df |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
103 |
branch: b |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
104 |
tag: tip |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
105 |
parent: 8:eebb944467c9 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
106 |
user: test |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
107 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
108 |
summary: close this part branch too |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
109 |
|
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
110 |
changeset: 11:c84627f3c15d |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
111 |
branch: b |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
112 |
user: test |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
113 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
114 |
summary: prune bad branch |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
115 |
|
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
116 |
--- branch b is back in action |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
117 |
b 13:6ac12926b8c3 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
118 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
8796
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
119 |
---- test heads listings |
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
120 |
changeset: 13:6ac12926b8c3 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
121 |
branch: b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
122 |
tag: tip |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
123 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
124 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
125 |
summary: reopen branch with a change |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
126 |
|
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
127 |
changeset: 11:c84627f3c15d |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
128 |
branch: b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
129 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
130 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
131 |
summary: prune bad branch |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
132 |
|
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
133 |
changeset: 7:10ff5895aa57 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
134 |
branch: a branch name much longer than the default justification used by branches |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
135 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
136 |
date: Thu Jan 01 00:00:06 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
137 |
summary: Adding d branch |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
138 |
|
|
8796
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
139 |
% branch default |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
140 |
changeset: 0:19709c5a4e75 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
141 |
user: test |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
142 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
143 |
summary: Adding root node |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
144 |
|
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
145 |
% branch a |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
146 |
changeset: 5:d8cbc61dbaa6 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
147 |
branch: a |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
148 |
parent: 2:881fe2b92ad0 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
149 |
user: test |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
150 |
date: Thu Jan 01 00:00:04 1970 +0000 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
151 |
summary: Adding b branch head 2 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
152 |
|
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
153 |
% branch b |
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
154 |
changeset: 13:6ac12926b8c3 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
155 |
branch: b |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
156 |
tag: tip |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
157 |
user: test |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
158 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
159 |
summary: reopen branch with a change |
|
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
160 |
|
|
8796
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
161 |
changeset: 13:6ac12926b8c3 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
162 |
branch: b |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
163 |
tag: tip |
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
164 |
user: test |
|
8796
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
165 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
166 |
summary: reopen branch with a change |
|
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
167 |
|
|
8796
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
168 |
changeset: 11:c84627f3c15d |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
169 |
branch: b |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
170 |
user: test |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
171 |
date: Thu Jan 01 00:00:09 1970 +0000 |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
172 |
summary: prune bad branch |
|
2bcef677a6c3
localrepo: remove 'closed' argument to heads(...) function
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7657
diff
changeset
|
173 |