test-branches.out
173 lines
| 5.7 KiB
| text/plain
|
TextLexer
/ tests / test-branches.out
Eric Hopper
|
r4675 | marked working directory as branch a | ||
Sune Foldager
|
r7006 | marked working directory as branch q | ||
reset working directory to branch a | ||||
Eric Hopper
|
r4675 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
marked working directory as branch b | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Sune Foldager
|
r7006 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
Eric Hopper
|
r4675 | marked working directory as branch c | ||
Patrick Mezard
|
r6815 | marked working directory as branch a branch name much longer than the default justification used by branches | ||
Sune Foldager
|
r7006 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||
b 4:aee39cd168d0 | ||||
c 6:589736a22561 (inactive) | ||||
a 5:d8cbc61dbaa6 (inactive) | ||||
Eric Hopper
|
r4675 | default 0:19709c5a4e75 (inactive) | ||
------- | ||||
Sune Foldager
|
r7006 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||
b 4:aee39cd168d0 | ||||
Dustin Sallings
|
r6067 | --- Branch a | ||
Sune Foldager
|
r7006 | changeset: 5:d8cbc61dbaa6 | ||
branch: a | ||||
parent: 2:881fe2b92ad0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: Adding b branch head 2 | ||||
changeset: 2:881fe2b92ad0 | ||||
branch: a | ||||
user: test | ||||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
summary: Adding to a branch | ||||
Dustin Sallings
|
r6067 | changeset: 1:dd6b440dd85a | ||
branch: a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: Adding a branch | ||||
---- Branch b | ||||
Sune Foldager
|
r7006 | changeset: 4:aee39cd168d0 | ||
Dustin Sallings
|
r6067 | branch: b | ||
user: test | ||||
date: Thu Jan 01 00:00:03 1970 +0000 | ||||
summary: Adding b branch head 1 | ||||
Sune Foldager
|
r7006 | changeset: 3:ac22033332d1 | ||
Dustin Sallings
|
r6067 | branch: b | ||
parent: 0:19709c5a4e75 | ||||
user: test | ||||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
summary: Adding b branch | ||||
John Mulligan
|
r7657 | ---- going to test branch closing | ||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
b 4:aee39cd168d0 | ||||
c 6:589736a22561 (inactive) | ||||
a 5:d8cbc61dbaa6 (inactive) | ||||
default 0:19709c5a4e75 (inactive) | ||||
2 files updated, 0 files merged, 4 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
b 10:bfbe841b666e | ||||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
c 6:589736a22561 (inactive) | ||||
a 5:d8cbc61dbaa6 (inactive) | ||||
default 0:19709c5a4e75 (inactive) | ||||
Matt Mackall
|
r9189 | abort: you must specify a branch to use --closed | ||
John Mulligan
|
r7657 | changeset: 10:bfbe841b666e | ||
branch: b | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: adding another cset to branch b | ||||
changeset: 8:eebb944467c9 | ||||
branch: b | ||||
parent: 4:aee39cd168d0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:07 1970 +0000 | ||||
summary: adding cset to branch b | ||||
changeset: 7:10ff5895aa57 | ||||
branch: a branch name much longer than the default justification used by branches | ||||
user: test | ||||
date: Thu Jan 01 00:00:06 1970 +0000 | ||||
summary: Adding d branch | ||||
b 8:eebb944467c9 | ||||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
--- b branch should be inactive | ||||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
Matt Mackall
|
r8991 | c 6:589736a22561 (inactive) | ||
a 5:d8cbc61dbaa6 (inactive) | ||||
default 0:19709c5a4e75 (inactive) | ||||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
John Mulligan
|
r7657 | b 12:2da6583810df (closed) | ||
c 6:589736a22561 (inactive) | ||||
a 5:d8cbc61dbaa6 (inactive) | ||||
default 0:19709c5a4e75 (inactive) | ||||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
John Mulligan
|
r8796 | no open branch heads on branch b | ||
changeset: 12:2da6583810df | ||||
branch: b | ||||
tag: tip | ||||
parent: 8:eebb944467c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: close this part branch too | ||||
changeset: 11:c84627f3c15d | ||||
branch: b | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: prune bad branch | ||||
John Mulligan
|
r7657 | --- branch b is back in action | ||
b 13:6ac12926b8c3 | ||||
a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
John Mulligan
|
r8796 | ---- test heads listings | ||
John Mulligan
|
r7657 | changeset: 13:6ac12926b8c3 | ||
branch: b | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: reopen branch with a change | ||||
changeset: 11:c84627f3c15d | ||||
branch: b | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: prune bad branch | ||||
changeset: 7:10ff5895aa57 | ||||
branch: a branch name much longer than the default justification used by branches | ||||
user: test | ||||
date: Thu Jan 01 00:00:06 1970 +0000 | ||||
summary: Adding d branch | ||||
John Mulligan
|
r8796 | % branch default | ||
changeset: 0:19709c5a4e75 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: Adding root node | ||||
% branch a | ||||
changeset: 5:d8cbc61dbaa6 | ||||
branch: a | ||||
parent: 2:881fe2b92ad0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: Adding b branch head 2 | ||||
% branch b | ||||
John Mulligan
|
r7657 | changeset: 13:6ac12926b8c3 | ||
branch: b | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: reopen branch with a change | ||||
John Mulligan
|
r8796 | changeset: 13:6ac12926b8c3 | ||
branch: b | ||||
tag: tip | ||||
John Mulligan
|
r7657 | user: test | ||
John Mulligan
|
r8796 | date: Thu Jan 01 00:00:09 1970 +0000 | ||
summary: reopen branch with a change | ||||
John Mulligan
|
r7657 | |||
John Mulligan
|
r8796 | changeset: 11:c84627f3c15d | ||
branch: b | ||||
user: test | ||||
date: Thu Jan 01 00:00:09 1970 +0000 | ||||
summary: prune bad branch | ||||