Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-backout.out @ 2509:6350b01d173f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with wsgi changes.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 27 Jun 2006 00:10:41 -0700
parents 9c660e691e90
children fc0ec2b64150
comparison
equal deleted inserted replaced
2508:ab460a3f0e3a 2509:6350b01d173f
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 the backout changeset is a new head - do not forget to merge
30 (use "backout -m" if you want to auto-merge)
31 b: No such file or directory