##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-addremove-similar
tests: unify test-addremove-similar
timeless - - Load All Authors

File last commit:

r11716:db426935 stable
r11851:db955418 default
Show More
test-issue522.out
21 lines | 913 B | text/plain | TextLexer
/ tests / test-issue522.out
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
merge: forcefully mark files that we get from the second parent as dirty...
 r5210 reverting foo
changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
 r8753 searching for copies back to rev 1
unmatched files in local:
bar
Alexis S. L. Carvalho
merge: forcefully mark files that we get from the second parent as dirty...
 r5210 resolving manifests
overwrite None partial False
ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
foo: remote is newer -> g
timeless
progress: use gerund (updating) for merge progress
 r11716 updating: foo 1/1 files (100.00%)
Alexis S. L. Carvalho
merge: forcefully mark files that we get from the second parent as dirty...
 r5210 getting foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Giorgos Keramidas
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
 r5858 n 0 -2 unset foo
Alexis S. L. Carvalho
merge: forcefully mark files that we get from the second parent as dirty...
 r5210 M foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
 r5405 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
Alexis S. L. Carvalho
merge: forcefully mark files that we get from the second parent as dirty...
 r5210 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