Mercurial > hg
view tests/test-issue619.out @ 11294:7b5d05e0fb1e
shrink-revlog: use util.mktempcopy() to preserve mode of index file.
(There's still a chmod() call to manually preserve the mode of the
data file.)
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Thu, 03 Jun 2010 10:18:33 -0400 |
parents | 6e65b451b62e |
children | 6f1d1ed3e19a |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: can't merge with ancestor done