Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-backout.out @ 2492:2f4addf56715

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test case for #295
author Brendan Cully <brendan@kublai.com>
date Fri, 23 Jun 2006 17:21:04 -0700
parents 8fe3d60b7f19
children 9c660e691e90
comparison
equal deleted inserted replaced
2491:ffde9eb23f59 2492:2f4addf56715
19 merging with changeset 2:b66ea5b77abb 19 merging with changeset 2:b66ea5b77abb
20 merging a 20 merging a
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
22 (branch merge, don't forget to commit) 22 (branch merge, don't forget to commit)
23 line 1 23 line 1
24 # backout should not back out subsequent changesets
25 adding a
26 adding b
27 reverting a
28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
29 b