Mercurial > hg
view tests/test-merge-types.out @ 8589:3edf133dcb5a
dirstate: skip step 3 in walk if nothing new will match
nothing will ever match on match.never
nothing new will match on match.exact (all found in step 1)
nothing new will match on match.match when
there is no pattern and
there is no direcory in pats
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Thu, 14 May 2009 19:54:26 +0200 |
parents | 8dca507e56ce |
children | af5f099d932b |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c searching for copies back to rev 1 conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % symlink is local parent, executable is other a has no flags (default for conflicts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f searching for copies back to rev 1 conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % symlink is other parent, executable is local a has no flags (default for conflicts)