Mercurial > hg
view tests/test-mq-merge.out @ 6805:482581431dcd
Sort removes first when applying updates (fixes issues 750 and 912)
This change ensures that removes happen first in applyupdates(). This avoids
issues where we try to make a case-only rename of a file on a case insensitive
system. Without this patch, the add of the new name happens before the remove
of the old one - which results in the file not existing, as the two names are
effectively the same.
With the patch, the old name gets removed then the new one gets added, which
is always safe.
author | Paul Moore <p.f.moore@gmail.com> |
---|---|
date | Tue, 01 Jul 2008 17:59:31 +0100 |
parents | f18f14bae172 |
children | fb32ae9c76e7 |
line wrap: on
line source
adding a adding b copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b created new head a b merging with queue at: .hg/patches.1 applying rm_a Now at: rm_a b Patch queue now empty % init t2 adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create the reference queue 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge merging with queue at refqueue (working directory not at tip) applying patcha Now at: patcha