| Fri, 24 Jan 2020 15:18:19 -0800 |
Martin von Zweigbergk |
merge: replace a repo.lookup('.') by more typical repo['.'].node()
|
| Fri, 24 Jan 2020 16:07:42 -0800 |
Martin von Zweigbergk |
merge: drop now-unused "abort" argument from hg.merge()
|
| Fri, 24 Jan 2020 17:49:21 -0800 |
Martin von Zweigbergk |
merge: don't auto-pick destination with `hg merge 'wdir()'`
|
| Fri, 24 Jan 2020 16:05:11 -0800 |
Martin von Zweigbergk |
merge: call hg.abortmerge() directly and return early
|
| Fri, 24 Jan 2020 16:00:54 -0800 |
Martin von Zweigbergk |
merge: check that there are no conflicts after --abort
|
| Fri, 24 Jan 2020 15:07:44 -0800 |
Martin von Zweigbergk |
merge: use check_incompatible_arguments() for --abort
|
| Wed, 15 Jan 2020 17:15:45 -0800 |
Martin von Zweigbergk |
rebase: move some variables after an error cases where they're not needed
|
| Wed, 15 Jan 2020 10:44:23 -0800 |
Martin von Zweigbergk |
rebase: clarify a little by calculating a set in Python instead of in revset
|
| Wed, 15 Jan 2020 15:12:50 -0800 |
Martin von Zweigbergk |
merge: avoid a negation in the definition of updatedirstate
|
| Fri, 24 Jan 2020 08:32:35 -0800 |
Martin von Zweigbergk |
merge: move definition of `partial` closer to where it's used
|
| Wed, 22 Jan 2020 13:06:56 -0800 |
Martin von Zweigbergk |
copies: extract function for finding directory renames
|
| Wed, 22 Jan 2020 15:23:30 -0800 |
Martin von Zweigbergk |
copies: avoid calculating debug-only stuff without --debug
|
| Wed, 22 Jan 2020 15:20:12 -0800 |
Martin von Zweigbergk |
copies: move early return in mergecopies() earlier
|
| Fri, 24 Jan 2020 07:00:45 -0800 |
Martin von Zweigbergk |
tests: test merge of renames of different sources to same target
|
| Fri, 24 Jan 2020 09:33:02 -0800 |
Martin von Zweigbergk |
clean: check that there are no conflicts after
|
| Fri, 24 Jan 2020 14:32:53 -0800 |
Martin von Zweigbergk |
progress: delete deprecated ui.progress()
|
