##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.
Matt Mackall - - Load All Authors

File last commit:

r10420:41d0ed2c merge default
r10521:bde1bb25 stable
Show More
test-branches.out
244 lines | 7.4 KiB | text/plain | TextLexer
/ tests / test-branches.out
History | Source | Raw |Copy content |Copy permalink
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
 r4675 marked working directory as branch a
Sune Foldager
branch: added more support for named branches...
 r7006 marked working directory as branch q
reset working directory to branch a
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
 r4675 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Sune Foldager
branch: added more support for named branches...
 r7006 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
 r4675 marked working directory as branch c
Wagner Bruna
branch: avoid using reserved tag names...
 r10417 abort: the name 'tip' is reserved
abort: the name 'null' is reserved
abort: the name '.' is reserved
Patrick Mezard
test-branches: add a test for long branch name (issue 1230)
 r6815 marked working directory as branch a branch name much longer than the default justification used by branches
Sune Foldager
branch: added more support for named branches...
 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
Change branches to sort 'active' branches first, and add an option to show only active branches.
 r4675 default 0:19709c5a4e75 (inactive)
-------
Sune Foldager
branch: added more support for named branches...
 r7006 a branch name much longer than the default justification used by branches 7:10ff5895aa57
b 4:aee39cd168d0
Dustin Sallings
Option to log to only show changesets within a specified branch.
 r6067 --- Branch a
Sune Foldager
branch: added more support for named branches...
 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
Option to log to only show changesets within a specified branch.
 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
branch: added more support for named branches...
 r7006 changeset: 4:aee39cd168d0
Dustin Sallings
Option to log to only show changesets within a specified branch.
 r6067 branch: b
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: Adding b branch head 1
Sune Foldager
branch: added more support for named branches...
 r7006 changeset: 3:ac22033332d1
Dustin Sallings
Option to log to only show changesets within a specified branch.
 r6067 branch: b
parent: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: Adding b branch
John Mulligan
branch closing: add test for branch closing (and reopening)
 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)
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
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
 r10350 changeset: 6:589736a22561
branch: c
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: Adding c branch
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: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Adding root node
John Mulligan
branch closing: add test for branch closing (and reopening)
 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
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
 r10350 changeset: 6:589736a22561
branch: c
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: Adding c branch
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: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Adding root node
John Mulligan
branch closing: add test for branch closing (and reopening)
 r7657 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
branches: add --closed flag for consistency with heads
 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
branch closing: add test for branch closing (and reopening)
 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
Dirkjan Ochtman
commands: don't do too much work for error messages
 r10346 no open branch heads found on branches b
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
 r8796 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
branch closing: add test for branch closing (and reopening)
 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
localrepo: remove 'closed' argument to heads(...) function...
 r8796 ---- test heads listings
John Mulligan
branch closing: add test for branch closing (and reopening)
 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: 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
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
 r10350 changeset: 6:589736a22561
branch: c
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: Adding c branch
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: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Adding root node
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
 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
Dirkjan Ochtman
commands: don't do too much work for error messages
 r10346 no open branch heads found on branches a
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
 r8796 % branch b
John Mulligan
branch closing: add test for branch closing (and reopening)
 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
localrepo: remove 'closed' argument to heads(...) function...
 r8796 changeset: 13:6ac12926b8c3
branch: b
tag: tip
John Mulligan
branch closing: add test for branch closing (and reopening)
 r7657 user: test
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
 r8796 date: Thu Jan 01 00:00:09 1970 +0000
summary: reopen branch with a change
John Mulligan
branch closing: add test for branch closing (and reopening)
 r7657
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
 r8796 changeset: 11:c84627f3c15d
branch: b
user: test
date: Thu Jan 01 00:00:09 1970 +0000
summary: prune bad branch