D12002: precheck: fix false warning about content-divergence creation

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Before this patch, if we try to `hg prune` (without any successors) an already obsoleted cset which has at least one successor, it would false warn about

D11619: hg: use dict.get() instead, to prevent KeyError

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11619 AFFECTED FILES mercurial/debugcommands.py mercurial/hg.py CHANGE

D10079: patch: fix a formatting issue

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D10079 AFFECTED FILES mercurial/patch.py CHANGE DETAILS diff --git

D10067: tests: accept output changes by 33350debb480

khanchi97 created this revision. Herald added a reviewer: durin42. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D10067 AFFECTED FILES tests/test-diff-upgrade.t

D10019: configitems: register an experimental evolve config

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Config: experimental.evolution.divergence-resolution-minimal=False (default) This experimental config gives user the flexibility to choose (in a

D10001: patch: make diff --git to differentiate b/w file is empty or doesn't exists

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Before this patch, as we didn't differentiate the two cases of a file in a context: 1. File doesn't exists 2. File is empty which causes the blob

D10000: tests: add a test to demonstrate a bug in `hg diff --git` (issue6486)

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Issue url: https://bz.mercurial-scm.org/show_bug.cgi?id=6486 This will be fixed in next patch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9659: rebase: handle the case when nothing to rebase (dry-run)

khanchi97 created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY In dry-run mode, even when there was no rebase in progress it tried to abort (for context, at the end of dry-run mode we

D9658: rebase: add test to demonstrate an issue in dry-run

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY In dry-run mode, the case when there is nothing to rebase is not handled correctly. Added test show that it try to abort a rebase while there is no rebase

D9442: help: fix a grammar/typo in hg help dates

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9442 AFFECTED FILES mercurial/helptext/dates.txt CHANGE DETAILS diff --git

D9009: py3: fix bytes and str mixup in run-tests

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9009 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git

D8979: run-tests: extract logic to get errpath in a utility func

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8979 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git

D8964: test-run-tests.t: add a --retest test to demonstrate a fix in next patch

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY As you see above the added lines, there was only one test failed. So the output should be: "running 1 tests using 1 parallel processes" Next

D8963: test-run-tests.t: remove a sub-test since we are done with it

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY removing test-failure.t to make sure that in next patch when we re-run failed tests using --retest, it won't get considered unnecessarily. REPOSITORY rHG

D8938: run-tests: refactor filtering logic for --retest flag

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY How I got to this: While re-running failed tests using --retest I noticed that the output: "running x tests using y parallel processes". was not

D8353: debugcommands: create new debugantivirusrunning command

khanchi97 added a comment. In D8353#129493 , @pulkit wrote: > In D8353#128839 , @marmoute wrote: > >> In D8353#128838 , @durin42 wrote: >> >>>

D8646: update: suggest --merge while `hg up` across topo branches

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Before this patch, during `hg up` across topological branches with dirty working directory we suggested the user to "commit or update --clean to discard"

D8643: absorb: make it clear what happens when no input

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8643 AFFECTED FILES hgext/absorb.py tests/test-absorb.t CHANGE DETAILS diff

D8621: phabricator: make it clear what happen when no response

khanchi97 created this revision. Herald added subscribers: mercurial-patches, Kwan. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8621 AFFECTED FILES hgext/phabricator.py tests/test-phabricator.t CHANGE

D8620: tests: make it clear what happen when no response entered

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8620 AFFECTED FILES tests/run-tests.py tests/test-run-tests.t CHANGE DETAILS

D6735: update: added support for --abort flag(issue4404)

khanchi97 added a comment. In D6735#100642 , @mharbison72 wrote: > Here's a case I stumbled upon that is a problem. It looks like it thinks it isn't in the middle of an update, but .hgsubstate isn't put back to the pre-update state. > >

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 updated this revision to Diff 19816. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7730?vs=19283=19816 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7730/new/ REVISION DETAIL

D7728: rebase: add test to demonstrate issue6180

khanchi97 updated this revision to Diff 19815. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7728?vs=19282=19815 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7728/new/ REVISION DETAIL

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 added inline comments. INLINE COMMENTS > martinvonz wrote in rebase.py:597 > I think it's incorrect that rebase sets two parents while the merge is being > resolved, but that's out of scope for this patch. I will look into it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 added a comment. In D7730#114953 , @pulkit wrote: > Unrelated to the fix, we need better way to skip commits during rebasing. Pruning manually is not a good option, IIRC git rebase have a `--skip` flag. Yeah, that's a good idea.

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 updated this revision to Diff 19283. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7730?vs=18939=19283 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7730/new/ REVISION DETAIL

D7728: rebase: add test to demonstrate issue6180

khanchi97 updated this revision to Diff 19282. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7728?vs=18937=19282 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7728/new/ REVISION DETAIL

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 added a comment. Ping. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7730/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7730 To: khanchi97, martinvonz, #hg-reviewers Cc: mercurial-devel

D7728: rebase: add test to demonstrate issue6180

khanchi97 added a comment. Ping. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7728/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7728 To: khanchi97, #hg-reviewers Cc: mercurial-devel ___

D7786: update: add --abort option in hg update command (issue4404)

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Here is, what --abort option is basically doing: 1. hg resolve --unmark, then 2. hg resolve --all --tool :local 3. hg up --tool :local Where,

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 created this revision. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, if a user is rebasing a stack of commits and hit a conflict in between and decided to drop that commit

D7727: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 added a comment. khanchi97 abandoned this revision. abandoing because I phabsent them in reverse order and it got messed up saying 'Graph cycle detected' REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7727/new/ REVISION DETAIL

D7728: rebase: add test to demonstrate issue6180

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It will be fixed in next patch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7728 AFFECTED FILES

D7727: rebase: make sure pruning does not confuse rebase (issue6180)

khanchi97 created this revision. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, if a user is rebasing a stack of commits and hit a conflict in between and decided to drop that commit

D7000: grep: enable all-files by default (BC)

Closed by commit rHG8cb5f96db235: grep: enable all-files by default (BC) (authored by khanchi97). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT

D7000: grep: enable all-files by default (BC)

khanchi97 added a comment. Sure :) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7000/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7000 To: khanchi97, #hg-reviewers Cc: JordiGH, mercurial-devel

D7000: grep: enable all-files by default (BC)

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch deprecates the `--all-files` flag and make the all-files behaviour as default. In test-grep.t, I removed '--all-files' from every command where

D6590: relnotes: document the new --force-close-branch flag

Closed by commit rHG4cafbd3b50c6: relnotes: document the new --force-close-branch flag (authored by khanchi97). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6590?vs=15726=15758

D6590: relnotes: document the new --force-close-branch flag

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6590 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next b/relnotes/next ---

D6490: commit: add --force-close-branch flag to close a non-head changeset

khanchi97 edited the summary of this revision. khanchi97 retitled this revision from "commit: add --force flag to close branch from a non-head changeset" to "commit: add --force-close-branch flag to close a non-head changeset". khanchi97 updated this revision to Diff 15633. REPOSITORY rHG

D6490: commit: add --force flag to close branch from a non-head changeset

khanchi97 added a comment. In D6490#95689 , @mharbison72 wrote: > In D6490#95686 , @khanchi97 wrote: > >> In D6490#95355 , @markand wrote: >> >>>

D6490: commit: add --force flag to close branch from a non-head changeset

khanchi97 added a comment. In D6490#95383 , @martinvonz wrote: > Could you also update relnotes/next (documenting either the new flag or config option, whatever this patch ends up doing)? Sure REPOSITORY rHG Mercurial CHANGES SINCE

D6490: commit: add --force flag to close branch from a non-head changeset

khanchi97 added a comment. In D6490#95355 , @markand wrote: > In D6490#95328 , @mharbison72 wrote: > >> In D6490#95305 , @pulkit wrote: >> >>> I

D6493: commit: make the error message more specific while aborting branch closing

Closed by commit rHGabd4783db5a7: commit: make the error message more specific while aborting branch closing (authored by khanchi97). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6493?vs=15533=15568#toc

D6491: commit: add a check if it is trying to close an already closed branch head

Closed by commit rHG9f7cb777b654: commit: add a check if it is trying to close an already closed branch head (authored by khanchi97). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6491?vs=15532=15567#toc

D6490: commit: add --force flag to close branch from a non-head changeset

khanchi97 retitled this revision from "branch: add --force flag to close branch from a not-head changeset" to "commit: add --force flag to close branch from a non-head changeset". khanchi97 updated this revision to Diff 15531. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6493: commit: make the error message more specific while aborting branch closing

khanchi97 retitled this revision from "branch: make the error message more specific while aborting branch closing" to "commit: make the error message more specific while aborting branch closing". khanchi97 updated this revision to Diff 15533. REPOSITORY rHG Mercurial CHANGES SINCE LAST

D6491: commit: add a check if it is trying to close an already closed branch head

khanchi97 retitled this revision from "branch: add a check if it is trying to close an already closed branch head" to "commit: add a check if it is trying to close an already closed branch head". khanchi97 updated this revision to Diff 15532. REPOSITORY rHG Mercurial CHANGES SINCE LAST

D6490: branch: add --force flag to close branch from a not-head changeset

khanchi97 marked an inline comment as done. khanchi97 added a comment. In https://phab.mercurial-scm.org/D6490#94625, @mharbison72 wrote: > LGTM, thanks. > > Minor nit that I don't care too much about, but I'm wondering what others think of `not-head changeset` vs `non-head

D6490: branch: add --force flag to close branch from a not-head changeset

khanchi97 marked an inline comment as done. khanchi97 added inline comments. INLINE COMMENTS > mharbison72 wrote in commands.py:1680 > I didn't realize that `--force` wasn't already an option for commit, because > it is an option to internal commit functions. I still like this idea, but >

D6490: branch: add --force flag to close branch from a not-head changeset

khanchi97 updated this revision to Diff 15380. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6490?vs=15363=15380 REVISION DETAIL https://phab.mercurial-scm.org/D6490 AFFECTED FILES mercurial/commands.py tests/test-alias.t tests/test-branches.t

D6493: branch: make the error message more specific while aborting branch closing

khanchi97 updated this revision to Diff 15382. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6493?vs=15366=15382 REVISION DETAIL https://phab.mercurial-scm.org/D6493 AFFECTED FILES mercurial/commands.py tests/test-commit-amend.t CHANGE DETAILS

D6491: branch: add a check if it is trying to close an already closed branch head

khanchi97 updated this revision to Diff 15381. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6491?vs=15364=15381 REVISION DETAIL https://phab.mercurial-scm.org/D6491 AFFECTED FILES mercurial/commands.py tests/test-branches.t CHANGE DETAILS diff

D6492: branch: add test covering the case when we have no branchheads to close

khanchi97 added a comment. Abandoned.. because I assumed this revision won't be pushed by `phabsend` as it's in secret phase. Is it right behavior? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6492 To: khanchi97, #hg-reviewers Cc: mercurial-devel

D6493: branch: make the error message more specific while aborting branch closing

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6493 AFFECTED FILES mercurial/commands.py tests/test-commit-amend.t CHANGE DETAILS diff --git

D6490: branch: add --force flag to close branch from a not-head changeset

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY While closing branch from a changeset which is not a branch head current implementation abort this action in every case but, there can be the situations where

D6491: branch: add a check if it is trying to close an already closed branch head

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It would check if the revision we are going to close is already a closed branch head and print the error message accordingly. REPOSITORY rHG Mercurial

D6492: branch: add test covering the case when we have no branchheads to close

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6492 AFFECTED FILES tests/test-branches.t CHANGE DETAILS diff --git a/tests/test-branches.t

Re: D6282: branch: abort if closing branch from a non-branchhead cset

on this :-) On Thu, May 9, 2019 at 8:53 AM Matt Harbison wrote: > On Sun, 05 May 2019 14:13:16 -0400, Pierre-Yves David > wrote: > > > > > > > On 5/1/19 11:18 PM, Sushil Khanchi wrote: > >> . > >> On Wed, May 1, 2019 at 9:22 PM Pierre-Yves David > >&

Re: Google Summer of Code 2019.

Congratulations Taapas and Navaneeth, I am very excited to work with you and hoping for great summers ahead. Let's get started :-) On Thu, May 9, 2019 at 6:15 PM Pulkit Goyal <7895pul...@gmail.com> wrote: > Hi everyone, > > Hope you are doing well. > > The results for summer of code are out. We

Re: D6282: branch: abort if closing branch from a non-branchhead cset

. On Wed, May 1, 2019 at 9:22 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > . > > On 5/1/19 2:14 PM, Sushil Khanchi wrote: > > . > > > > On Wed, May 1, 2019 at 5:14 PM Pierre-Yves David > > mailto:pierre-yves.da...@ens-lyon.org>> &g

Re: D6282: branch: abort if closing branch from a non-branchhead cset

. On Wed, May 1, 2019 at 5:14 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 5/1/19 1:14 PM, Sushil Khanchi wrote: > > . > > > > On Fri, Apr 26, 2019 at 8:29 PM Pierre-Yves David > > mailto:pierre-yves.da...@ens-lyon.org>> >

Re: D6282: branch: abort if closing branch from a non-branchhead cset

. On Fri, Apr 26, 2019 at 8:29 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 4/19/19 9:49 AM, khanchi97 (Sushil khanchi) wrote: > > khanchi97 created this revision. > > Herald added a subscriber: mercurial-devel. > > Hera

D6282: branch: abort if closing branch from a non-branchhead cset

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8d14d91584f1: branch: abort if closing branch from a non-branchhead cset (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6281: branch: add tests which shows branch can be closed from a non-branchhead cset

This revision was automatically updated to reflect the committed changes. Closed by commit rHG258821f2d465: branch: add tests which shows branch can be closed from a non-branchhead cset (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6281: branch: add tests which shows branch can be closed from a non-branchhead cset

khanchi97 added inline comments. INLINE COMMENTS > test-branches.t:961 > + $ hg ci -m "closing branch" --close-branch > + created new head > + I created this patch assuming that hg should not allow to create a branch closing commit from a cset which is not a branch head. Let me know if I am

D6282: branch: abort if closing branch from a non-branchhead cset

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch make sure that we abort if the user is trying to close a branch from a cset which is not a branch head. Changes in test file reflect the fixed

D6281: branch: add tests which shows branch can be closed from a non-branchhead cset

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch shows that we can close a branch even from a cset which is not a branch head. It was supposed to abort this operation. Next patch will be fixing

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6308aa828cf4: patch: include flag-only file changes in special while filtering patch… (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 marked an inline comment as done. khanchi97 added a comment. Thanks, it is more clear now. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6058 To: khanchi97, #hg-reviewers, mharbison72 Cc: mharbison72, mercurial-devel

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 marked an inline comment as done. khanchi97 added inline comments. INLINE COMMENTS > mharbison72 wrote in test-split.t:744 > This happens because you can't have nested `#if`. i.e. this doesn't work: > > #if .. > ... > #if .. > ... > #endif > #endif > > You can list

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 updated this revision to Diff 14524. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6058?vs=14485=14524 REVISION DETAIL https://phab.mercurial-scm.org/D6058 AFFECTED FILES mercurial/patch.py tests/test-split.t CHANGE DETAILS diff --git

Re: D6128: chistedit:improve location of highlighted cursor.(issue6073)

Please remove unnecessary blank lines added/removed in your patch. Your patch should contain the changed related to the issue only. You can always look at the changes a patch contains using `hg log -p -r rev`. On Thu, Mar 14, 2019 at 1:44 AM akshjain.jain74 (Akshit Jain) <

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 added inline comments. INLINE COMMENTS > test-split.t:734 > > -#if no-windows > +#if windows > +TODO: Fix this on Windows. See issue 2020 and 5883 I moved the part when on windows (#if windows) at the top because I found it easy to include nested conditions then. REPOSITORY rHG

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 updated this revision to Diff 14485. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6058?vs=14323=14485 REVISION DETAIL https://phab.mercurial-scm.org/D6058 AFFECTED FILES mercurial/patch.py tests/test-split.t CHANGE DETAILS diff --git

D5963: copies: handle a case when both merging csets are not descendant of merge base

khanchi97 added inline comments. INLINE COMMENTS > martinvonz wrote in copies.py:571 > I am also still not sure, even after spending several hours on this code :( > But I am also not sure it's incorrect, and I don't want to hold up this patch > more than I already have, so I'll queue this.

D5963: copies: handle a case when both merging csets are not descendant of merge base

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7694b685bb10: copies: handle a case when both merging csets are not descendant of merge base (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5962: copies: add test that makes both the merging csets dirty and fails

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfc4b7a46fda1: copies: add test that makes both the merging csets dirty and fails (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5961: copies: add test that makes both the merging csets dirty and run w/o error

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcbdd2b56d4c3: copies: add test that makes both the merging csets dirty and run w/o error (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 marked 2 inline comments as done. khanchi97 added a comment. Thanks, I have updated the patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5962 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel

D5963: copies: handle a case when both merging csets are not descendant of merge base

khanchi97 updated this revision to Diff 14457. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5963?vs=14348=14457 REVISION DETAIL https://phab.mercurial-scm.org/D5963 AFFECTED FILES mercurial/copies.py tests/test-copies.t CHANGE DETAILS diff

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14456. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14347=14456 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 added a comment. Thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5961 To: khanchi97, #hg-reviewers, martinvonz Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list

D5963: copies: handle a case when both merging csets are not descendant of merge base

khanchi97 added a comment. Gentle ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5963 To: khanchi97, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5962 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5961 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6058 To: khanchi97, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D6057: split: add tests which demonstrate the issue5864

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7da6307cc07a: split: add tests which demonstrate the issue5864 (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6057: split: add tests which demonstrate the issue5864

khanchi97 added a comment. Ping for review! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6057 To: khanchi97, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 added a comment. I have updated the commit message too. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5961 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list

D5963: copies: handle a case when both merging csets are not descendant of merge base

khanchi97 updated this revision to Diff 14348. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5963?vs=14310=14348 REVISION DETAIL https://phab.mercurial-scm.org/D5963 AFFECTED FILES mercurial/copies.py tests/test-copies.t CHANGE DETAILS diff

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14347. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14309=14347 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 updated this revision to Diff 14346. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5961?vs=14308=14346 REVISION DETAIL https://phab.mercurial-scm.org/D5961 AFFECTED FILES tests/test-copies.t

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 added a comment. Updating it acc to your suggestions. INLINE COMMENTS > martinvonz wrote in test-copies.t:495-497 > I don't follow this. What does "dirty" mean here? We normally mean that there > are changes in the working copy when we say dirty, but that's clearly not > what you

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch fix the issue5864 (or maybe issue5865 too) which occurs during split (or I should say at the time of filtering the hunks in interactive mode) where

D6057: split: add tests which demonstrate the issue5864

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6057 AFFECTED FILES tests/test-split.t CHANGE DETAILS diff --git a/tests/test-split.t

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 added a comment. In https://phab.mercurial-scm.org/D5961#88217, @martinvonz wrote: > From `test-check-code.t`: > > @@ -15,6 +15,13 @@ > Skipping i18n/polib.py it has no-che?k-code (glob) > Skipping mercurial/statprof.py it has no-che?k-code (glob) >

D5963: copies: handle a case when both merging csets are not descendant of merge base

khanchi97 updated this revision to Diff 14310. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5963?vs=14241=14310 REVISION DETAIL https://phab.mercurial-scm.org/D5963 AFFECTED FILES mercurial/copies.py tests/test-copies.t CHANGE DETAILS diff

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14309. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14240=14309 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

D5961: copies: add test that makes both the merging csets dirty and run w/o error

khanchi97 updated this revision to Diff 14308. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5961?vs=14239=14308 REVISION DETAIL https://phab.mercurial-scm.org/D5961 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

  1   2   3   4   >