Mercurial > hg
comparison tests/test-rename-merge2.t @ 18539:cf25e4efd685
merge: delay prompts a bit and show them in (extra) sorted order
Preparing for backout of 760c0d67ce5e.
The number of prompts will for all relevant cases be significantly smaller than
the total number of files in the manifests. We can thus afford to sort the
prompts more than we can afford to sort the manifests.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 24 Jan 2013 23:57:44 +0100 |
parents | 5a4f220fbfca |
children | 5ed6a375e9ca |
comparison
equal
deleted
inserted
replaced
18538:94317c2d53b8 | 18539:cf25e4efd685 |
---|---|
615 -------------- | 615 -------------- |
616 searching for copies back to rev 1 | 616 searching for copies back to rev 1 |
617 resolving manifests | 617 resolving manifests |
618 overwrite: False, partial: False | 618 overwrite: False, partial: False |
619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a | 619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
620 b: versions differ -> m | |
621 rev: versions differ -> m | |
620 local changed a which remote deleted | 622 local changed a which remote deleted |
621 use (c)hanged version or (d)elete? c | 623 use (c)hanged version or (d)elete? c |
622 a: prompt keep -> a | 624 a: prompt keep -> a |
623 b: versions differ -> m | |
624 rev: versions differ -> m | |
625 preserving b for resolve of b | 625 preserving b for resolve of b |
626 preserving rev for resolve of rev | 626 preserving rev for resolve of rev |
627 updating: a 1/3 files (33.33%) | 627 updating: a 1/3 files (33.33%) |
628 updating: b 2/3 files (66.67%) | 628 updating: b 2/3 files (66.67%) |
629 picked tool 'python ../merge' for b (binary False symlink False) | 629 picked tool 'python ../merge' for b (binary False symlink False) |