This revision was automatically updated to reflect the committed changes.
Closed by commit rHGda2e874fe582: resolve: when resolve.mark-check=abort,
downgrade to warning if pats specified (authored by spectral, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.me
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG78e5b9d815fa: test: fix self._testdir to use the right
mercurial library during testing (authored by sangeet259, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D5199?vs=12390&id
yuja added a comment.
Queued for stable, thanks.
> Previously, with --config resolve.mark-check=abort, running `hg resolve
-m foo`
> would abort and emit a message saying to use --all. This command does
not work,
> though: `hg resolve -m foo --all`, and it's really weird for -
Queued for stable, thanks.
> Previously, with --config resolve.mark-check=abort, running `hg resolve -m
> foo`
> would abort and emit a message saying to use --all. This command does not
> work,
> though: `hg resolve -m foo --all`, and it's really weird for --all to be the
> "--force" f
yuja added a comment.
Queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5199
To: sangeet259, #hg-reviewers
Cc: yuja, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https
Queued, thanks.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
On Sat, 03 Nov 2018 20:55:47 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1541292604 14400
> # Sat Nov 03 20:50:04 2018 -0400
> # Node ID ff37b1712fa531ead5fdd34aa3bb7e6fa60af716
> # Parent 8664fdc1cfb3b4a64fdb2a6d138b49fe17fcd0b3
> tests: conditonalize
# HG changeset patch
# User Matt Harbison
# Date 1541292604 14400
# Sat Nov 03 20:50:04 2018 -0400
# Node ID ff37b1712fa531ead5fdd34aa3bb7e6fa60af716
# Parent 8664fdc1cfb3b4a64fdb2a6d138b49fe17fcd0b3
tests: conditonalize a difference in test-merge-tools.t on Windows
diff --git a/tests/test-
sangeet259 added a comment.
@yuja
This passes the tests now. I had missed the subsequent code that was
dependent on the earlier initialisation of `self._testdir`.
Fixed it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5199
To: sangeet259, #hg-reviewers
C
sangeet259 updated this revision to Diff 12390.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5199?vs=12389&id=12390
REVISION DETAIL
https://phab.mercurial-scm.org/D5199
AFFECTED FILES
tests/run-tests.py
CHANGE DETAILS
diff --git a/tests/run-tests.
sangeet259 abandoned this revision.
sangeet259 added a comment.
I passed the wrong revision number in the -r flag.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5219
To: sangeet259, #hg-reviewers
Cc: mercurial-devel
_
sangeet259 updated this revision to Diff 12389.
sangeet259 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5199?vs=12351&id=12389
REVISION DETAIL
https://phab.mercurial-scm.org/D5199
AFFECTED FILES
tests/run-tests.p
sangeet259 added a comment.
This was an error. Ignore, something went wrong.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5219
To: sangeet259, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercur
sangeet259 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
These changes are no longer necessary so we better drop them.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5219
AFFECTED FILES
14 matches
Mail list logo
