- 25 Aug, 2020 1 commit
-
-
Sushil Khanchi authored
This patch adds a test coverage for the resolution of a case where one side amended some content changes and other side moved backward and created content-divergence.
-
- 27 Nov, 2020 1 commit
-
-
Sushil Khanchi authored
This test covers a case where one of cset moved forward/backward and parent of "base" is obsolete. And add code coverage of one of the block in content-divergence resolution logic.
-
- 25 Oct, 2020 1 commit
-
-
Sushil Khanchi authored
While deciding the resolution parent for content-divergence resolution, now we use 3-way merge logic to check, if only one of them was moved from its original position by applying the logic on following: (parent of "base", parent of "divergent", parent of "other") Before this patch, we always set the parent of ahead one (from the two divergent cset) as resolution parent and then make sure both are located on resolution parent and perform 3-way merge to get resultant cset. But now, if the reason behind content-divergence is that one side amended some content changes while other moved forward/backward in the dag; we set the parent of relocated one as resolution parent and then make sure both are on resolution parent and perform 3-way merge. This patch also adds few new lines to support a case where "one cset moved somewhere; other moved to successor of base.p1()" Changes is test files reflect the changed behavior.
-
- 22 Oct, 2020 2 commits
-
-
Sushil Khanchi authored
-
Sushil Khanchi authored
This change makes the code clear and will help us in upcoming patches.
-
- 11 Oct, 2020 2 commits
-
-
Sushil Khanchi authored
-
Sushil Khanchi authored
This will also make it easy for us to use gca value in upcoming patches.
-
- 26 Nov, 2020 3 commits
-
-
Pierre-Yves David authored
-
Anton Shestakov authored
CORE-TEST-OUTPUT-UPDATE: ac362d5a7893
-
Anton Shestakov authored
Now that strip lives in core hg, let's test that using debugstrip without enabling strip extension works as expected.
-
- 25 Nov, 2020 1 commit
-
-
Anton Shestakov authored
Since the debugstrip command from core and strip command from the hgext.strip extension is now the same thing, we don't have to wrap them separately. Unless, of course, users have a copy of old (from hg 5.6 and earlier) hgext.strip laying around that they specifically want to use, but I don't think we want to support that use case.
-
- 23 Nov, 2020 1 commit
-
-
Anton Shestakov authored
--HG-- branch : stable
-
- 19 Nov, 2020 1 commit
-
-
Martin von Zweigbergk authored
CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
-
- 16 Nov, 2020 1 commit
-
-
Martin von Zweigbergk authored
`cmdutil.commitstatus()` was changed in https://phab.mercurial-scm.org/D9257 so it has a new `tip` argument. This patch adds compatibility with that. It was harder than I expected because the callers all pass the arguments as positional, so we can't look for `opts` or `tip` in the `kwargs`. I instead extracted much of the override to a helper. I think the result is okay.
-
- 11 Nov, 2020 1 commit
-
-
Anton Shestakov authored
--HG-- branch : stable
-
- 29 Oct, 2020 1 commit
-
-
Martin von Zweigbergk authored
CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
-
- 31 Oct, 2020 7 commits
-
-
Pierre-Yves David authored
-
Pierre-Yves David authored
--HG-- branch : stable
-
Anton Shestakov authored
--HG-- branch : stable
-
Anton Shestakov authored
--HG-- branch : stable
-
Anton Shestakov authored
--HG-- branch : stable
-
Anton Shestakov authored
--HG-- branch : stable
-
Anton Shestakov authored
--HG-- branch : stable
-
- 30 Oct, 2020 2 commits
-
-
Anton Shestakov authored
--HG-- branch : stable
-
Anton Shestakov authored
-
- 28 Oct, 2020 1 commit
-
-
Pierre-Yves David authored
-
- 25 Oct, 2020 1 commit
-
-
Anton Shestakov authored
-
- 24 Oct, 2020 3 commits
-
-
Anton Shestakov authored
-
Anton Shestakov authored
-
Anton Shestakov authored
-
- 14 Oct, 2020 3 commits
-
-
Sushil Khanchi authored
-
Sushil Khanchi authored
-
Sushil Khanchi authored
-
- 20 Oct, 2020 1 commit
-
-
Pierre-Yves David authored
-
- 14 Oct, 2020 1 commit
-
-
Pierre-Yves David authored
If this option is set to `from-branch`, a user can call `hg merge some-topic` from a bare branch even if `some-topic` is a direct descendant of the current working copy parents. This was previously denied if the changesets was on the same branch, since the result would be an "oedipus merge". Some user have been requesting this, and this type of merge is one of Gitlab standard way of merging a "Merge Request". That new option will unlock issue `heptapod#200` and make this mode available for those who wants it.
-
- 15 Oct, 2020 1 commit
-
-
Pierre-Yves David authored
-
- 12 Oct, 2020 2 commits
-
-
Sietse Brouwer authored
--HG-- branch : stable
-
Sietse Brouwer authored
--HG-- branch : stable
-
- 11 Oct, 2020 1 commit
-
-
Anton Shestakov authored
Switching "(%d changesets obsoleted)" to using successorsmap because it's the source of items in relationships (and the latter variable now can have less items than before this patch).
-
- 07 Oct, 2020 1 commit
-
-
Sietse Brouwer authored
This commit does two things: - Firstly, it tweaks the ngtip revset test to exercise the -G/--graph flag. This successfully triggers the bug when it is present. - Secondly, it changes the `ngtip` revset to return a revset made from integer revs instead of node hash bytes. The test now passes. Details: The TypeError was triggered by running hg log -r 'ngtip("default")' --graph in a repository with more than one changeset. The --graph tag caused the flow of control to call `reachableroots2` with the changeset ID found by the `ngtip` revset. Because the changeset ID was a node hash (bytes) instead of a rev (int), reachableroots2 raised the following error: TypeError: an integer is required (got type bytes) --HG-- branch : stable
-