Mercurial > hg

view tests/test-issue522.out @ 7071:643c751e60b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeroconf: initial implementation This is a basic, hopefully portable, zeroconf extension. Enabling it will allow hg paths/pull/push/clone/etc. to automatically discover services advertised as "_hg". And naturally, running hg serve will advertise itself as a "_hg" service as well as a "_http" service for use by browsers.
author Matt Mackall <mpm@selenic.com>
date Wed, 08 Oct 2008 19:58:35 -0500
parents e7ed5d07cc4c
children af5f099d932b
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
resolving manifests
 overwrite None partial False
 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
  searching for copies back to rev 1
  unmatched files in local:
   bar
 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