Mercurial > hg

view tests/test-issue522.out @ 9158:d6eecafaf12f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: use reStructuredText for man and HTML pages The Makefile now requires the rst2html and rst2man programs. Both can be found in Debian testing or downloaded from the Docutils homepage: http://docutils.sf.net/ http://docutils.sf.net/sandbox/manpage-writer/ The new HTML and man pages no longer contain huge amounts of un-wrapping literal blocks, thanks to how snippets of reStructuredText can easily be included inside other reStructuredText documents. The HTML pages now have anchors for all sections, including the help topics in hgrc.1 which were missing from the old HTML pages.
author Martin Geisler <mg@lazybytes.net>
date Thu, 16 Jul 2009 23:25:26 +0200
parents af5f099d932b
children ba5e508b5e92
line wrap: on
line source

reverting foo
changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  searching for copies back to rev 1
  unmatched files in local:
   bar
resolving manifests
 overwrite None partial False
 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
 foo: remote is newer -> g
getting foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 unset               foo
M foo
c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
     1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
     2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000