Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-hup.out @ 3295:764688cf51e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents b72562060e45
children 8ae88ed2a3b6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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.i
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 data
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 642
diff changeset
9 journal.dirstate