Mercurial > hg
comparison hgweb.cgi @ 20149:578b888c820e stable
unshelve: don't commit unknown files during unshelve (issue4113)
Previously, unshelve would temporarily commit unknown files (via addremove) in
an attempt to allow unshelving into unknown files. This produced unexpected
results, like the file time stamp changing and a .i file being created.
This change makes it no longer use addremove. It ignores unknown files
completely. If an unshelve would overwrite an unknown file, the unknown file is
moved to *.orig
The shelve continue/abort format is changed, but it just removes stuff from the
end of the file, so it can still read the old format.
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 26 Nov 2013 16:23:05 -0800 |
parents | 85cba926cb59 |
children | 4b0fc75f9403 |
comparison
equal
deleted
inserted
replaced
20148:7ac03bfa1369 | 20149:578b888c820e |
---|