tests/test-hup.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Apr 2006 21:38:59 +0200
changeset 2044 b343e7d454b4
parent 1261 fccc90f1994e
child 2223 b72562060e45
permissions -rw-r--r--
Don't allow --style and --template for hg update and hg merge. The only way that changesets will be shown with these command is in an error message when trying to update to an ambiguous branch name.
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
killed!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     5
transaction abort!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     6
rollback completed
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     7
00changelog.d
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     8
00changelog.i
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     9
data
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 642
diff changeset
    10
journal.dirstate