Mercurial > hg
comparison tests/test-rename-merge1.t @ 26618:8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.
The test output changes indicate the actual behavior change happening.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 21:56:39 -0700 |
| parents | d8463a743d7d |
| children | d16d73173fdd |
comparison
equal
deleted
inserted
replaced
| 26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
|---|---|
| 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
| 39 preserving a for resolve of b | 39 preserving a for resolve of b |
| 40 removing a | 40 removing a |
| 41 b2: remote created -> g | 41 b2: remote created -> g |
| 42 getting b2 | 42 getting b2 |
| 43 b: remote moved from a -> m | 43 b: remote moved from a -> m (premerge) |
| 44 picked tool ':merge' for b (binary False symlink False) | 44 picked tool ':merge' for b (binary False symlink False) |
| 45 merging a and b to b | 45 merging a and b to b |
| 46 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | 46 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
| 47 premerge successful | 47 premerge successful |
| 48 note: possible conflict - a2 was renamed multiple times to: | 48 note: possible conflict - a2 was renamed multiple times to: |