tests/test-hup.out
author Matt Mackall <mpm@selenic.com>
Sun, 15 Feb 2009 10:50:48 -0600
changeset 7768 5bf5fd1e2a74
parent 5814 dd5a501cb97f
child 10881 a685011ed38e
permissions -rw-r--r--
merge: mark kept local files as readded on linear update (issue539)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
0
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
0
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     3
adding changesets
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     4
transaction abort!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     5
rollback completed
4970
30d4d8985dd8 transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents: 4269
diff changeset
     6
killed!
5814
dd5a501cb97f restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents: 4970
diff changeset
     7
.hg/00changelog.i .hg/journal.branch .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a