# HG changeset patch
# User Boris Feld
# Date 1507486294 -7200
# Sun Oct 08 20:11:34 2017 +0200
# Node ID cdac8099d6c07e3d96e1c7c8fadab713f2111bd7
# Parent 8cef8f7d51d0f1e99889779ec1320d5c9c3b91de
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507493195 -7200
# Sun Oct 08 22:06:35 2017 +0200
# Node ID a04c92da73b7f01008ff4e75f310fdea2f1d2a57
# Parent f528a23fc82acfa9131a8a60aabbc64bb21556ff
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507486569 -7200
# Sun Oct 08 20:16:09 2017 +0200
# Node ID 1b9db6bb7fc2997f0dcd286a768a45e5f65f288f
# Parent cdac8099d6c07e3d96e1c7c8fadab713f2111bd7
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507488139 -7200
# Sun Oct 08 20:42:19 2017 +0200
# Node ID 9f2d0eb6d0d4633e45f470bc0a192443d80aa730
# Parent 1b9db6bb7fc2997f0dcd286a768a45e5f65f288f
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507491682 -7200
# Sun Oct 08 21:41:22 2017 +0200
# Node ID 797945ae8e8f270f20f0c4aa841546b1f8ea508d
# Parent b1fac4afd28d6e1c891197f757b5764de8effd04
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507493267 -7200
# Sun Oct 08 22:07:47 2017 +0200
# Node ID 26ed1b03a337b254a361a09c21839689011b1593
# Parent 4b8ab80c7f80c391134393fc3a28ea5746dc7807
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507491386 -7200
# Sun Oct 08 21:36:26 2017 +0200
# Node ID b1fac4afd28d6e1c891197f757b5764de8effd04
# Parent 5ea201107ad2ba50b466fe0c7bfebe77ad1e4a50
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507491697 -7200
# Sun Oct 08 21:41:37 2017 +0200
# Node ID f528a23fc82acfa9131a8a60aabbc64bb21556ff
# Parent 797945ae8e8f270f20f0c4aa841546b1f8ea508d
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507493241 -7200
# Sun Oct 08 22:07:21 2017 +0200
# Node ID 4b8ab80c7f80c391134393fc3a28ea5746dc7807
# Parent a04c92da73b7f01008ff4e75f310fdea2f1d2a57
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507491670 -7200
# Sun Oct 08 21:41:10 2017 +0200
# Node ID 5ea201107ad2ba50b466fe0c7bfebe77ad1e4a50
# Parent 71e83aee3eb9ff505e94127ffb83c2b6fc6642bf
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507492034 -7200
# Sun Oct 08 21:47:14 2017 +0200
# Node ID fe09fec9dd8586ed9768feaa6f5cf6aadcc663c8
# Parent 9769711a3f453c53163200eb4a99107eb3a1433b
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507488226 -7200
# Sun Oct 08 20:43:46 2017 +0200
# Node ID 9769711a3f453c53163200eb4a99107eb3a1433b
# Parent 9f2d0eb6d0d4633e45f470bc0a192443d80aa730
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507492120 -7200
# Sun Oct 08 21:48:40 2017 +0200
# Node ID 71e83aee3eb9ff505e94127ffb83c2b6fc6642bf
# Parent fe09fec9dd8586ed9768feaa6f5cf6aadcc663c8
# EXP-Topic config.register
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
https://bz.mercurial-scm.org/show_bug.cgi?id=5703
Bug ID: 5703
Summary: Mercurial fails to commit on newly created repository
Product: Mercurial
Version: 4.3
Hardware: PC
OS: Windows
Status: UNCONFIRMED
Se
# HG changeset patch
# User Kostia Balytskyi
# Date 1507541423 25200
# Mon Oct 09 02:30:23 2017 -0700
# Node ID aa5c7de6a86ba8bbc7d46bb414ac7ee6fbde3a4a
# Parent a57c938e7ac8f391a62de6c7c4d5cf0e81b2dcf4
windows: add an experimental option for long paths support
This commit adds an experimen
lothiraldan accepted this revision.
lothiraldan added inline comments.
INLINE COMMENTS
> quark wrote in encoding.py:596
> I think it's the callback's responsibility to catch exceptions if they need
> to. Besides, we don't do that for `hg.wirepeersetupfuncs`.
Ok, thank you for the explanation.
On 10/08/2017 08:02 AM, Yuya Nishihara wrote:
>>> +current_branch = repo[None].branch()
>>> if (util.safehasattr(repo, 'mq') and p2 != nullid
>>> and p2 in [x.node for x in repo.mq.applied]):
>>> urev = p2
>>> +elif current_branch != repo[urev].branch():
>>> +
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D986
To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
_
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
- ui.configint() ?
- I don't think taking the first 5 candidates would do something sensible. Is
it reasonable?
- tests?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab
On Mon, 9 Oct 2017 13:08:29 +0200, Paul Morelle wrote:
> On 10/08/2017 08:02 AM, Yuya Nishihara wrote:
> >>> +current_branch = repo[None].branch()
> >>> if (util.safehasattr(repo, 'mq') and p2 != nullid
> >>> and p2 in [x.node for x in repo.mq.applied]):
> >>> urev = p2
>
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe79b3611223b: copies: add docs for config
`experimental.copytrace.sourcecommitlimit` (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-sc
# HG changeset patch
# User Boris Feld
# Date 1507559503 -7200
# Mon Oct 09 16:31:43 2017 +0200
# Node ID c4b29d40d4823d0233110e8de36b26ec71ef29af
# Parent a5d695caa0ad1b30d0542417472865cf0529059d
# EXP-Topic config.register.followup
# Available At https://bitbucket.org/octobus/mercurial-dev
# HG changeset patch
# User Boris Feld
# Date 1507563183 -7200
# Mon Oct 09 17:33:03 2017 +0200
# Node ID a5d695caa0ad1b30d0542417472865cf0529059d
# Parent 8cef8f7d51d0f1e99889779ec1320d5c9c3b91de
# EXP-Topic config.register.followup
# Available At https://bitbucket.org/octobus/mercurial-dev
ekent created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The fsmonitor extension currently sends state-enter and state-leave
notifications to watchman on the update operation. This commit creates
additional notifications
ekent created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Change the distance calculation in the fsmonitor extension. It is done in a
method since anticipated changes will need to use this logic as well.
TEST PLAN
Tested
quark accepted this revision.
quark added a comment.
This was previously reviewed internally.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D989
To: ekent, #hg-reviewers, quark
Cc: quark, mercurial-devel
___
Mercurial-
# HG changeset patch
# User Boris Feld
# Date 1507480369 -7200
# Sun Oct 08 18:32:49 2017 +0200
# Node ID 7a2a2f58094560b307ba7980904dd4fc0087eddb
# Parent 29bb94cd7a882b572324c07a7c2fdc974956e6e5
# EXP-Topic b2.phases.hooks
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507477846 -7200
# Sun Oct 08 17:50:46 2017 +0200
# Node ID 170106b4c7df81e4af2b46d72b97c9a9c3ad9565
# Parent c7b1a3b41823e4e4969e17feefaaede4c89fe48c
# EXP-Topic b2.phases.hooks
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507460911 -7200
# Sun Oct 08 13:08:31 2017 +0200
# Node ID 29bb94cd7a882b572324c07a7c2fdc974956e6e5
# Parent 8cef8f7d51d0f1e99889779ec1320d5c9c3b91de
# EXP-Topic b2.phases.hooks
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507481414 -7200
# Sun Oct 08 18:50:14 2017 +0200
# Node ID c7b1a3b41823e4e4969e17feefaaede4c89fe48c
# Parent 7a2a2f58094560b307ba7980904dd4fc0087eddb
# EXP-Topic b2.phases.hooks
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507476198 -7200
# Sun Oct 08 17:23:18 2017 +0200
# Node ID f91113645b0384ce92b538775cb647fc4b238e2a
# Parent 170106b4c7df81e4af2b46d72b97c9a9c3ad9565
# EXP-Topic b2.phases.hooks
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507302319 -7200
# Fri Oct 06 17:05:19 2017 +0200
# Node ID 9562040f5081064c95000a6f2d8148d9d40c3f6f
# Parent c530db7ca893c8c1c93f47c775e0ccedc9ade91f
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507300601 -7200
# Fri Oct 06 16:36:41 2017 +0200
# Node ID c530db7ca893c8c1c93f47c775e0ccedc9ade91f
# Parent fe4b0b77c2456419342cc50b4c697c7518be8d6c
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507299827 -7200
# Fri Oct 06 16:23:47 2017 +0200
# Node ID 7a980312f1ef903557c040ea44b61395d3591f8f
# Parent 73e204102f7e4af7172c9e88e39675ca73cfc34f
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507305216 -7200
# Fri Oct 06 17:53:36 2017 +0200
# Node ID ab0796c0fbce5d8314511bf08ea5b6b4cf0b9dfc
# Parent 1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507302949 -7200
# Fri Oct 06 17:15:49 2017 +0200
# Node ID 73e204102f7e4af7172c9e88e39675ca73cfc34f
# Parent c60eccc28286bdb8f962b75b7dab0fa87c6abb7d
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507209918 -7200
# Thu Oct 05 15:25:18 2017 +0200
# Node ID 1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
# Parent 14824410b05da8d360ddd65c1f8727cc3bafb111
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507218176 -7200
# Thu Oct 05 17:42:56 2017 +0200
# Node ID c60eccc28286bdb8f962b75b7dab0fa87c6abb7d
# Parent 5657c12f1f9ef4190f390a50194d5e614e67b8c8
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507556052 -7200
# Mon Oct 09 15:34:12 2017 +0200
# Node ID 6e0fee80294eeb51f209dbc337371894fcaa9e7b
# Parent 7a980312f1ef903557c040ea44b61395d3591f8f
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
# HG changeset patch
# User Boris Feld
# Date 1507556066 -7200
# Mon Oct 09 15:34:26 2017 +0200
# Node ID 14824410b05da8d360ddd65c1f8727cc3bafb111
# Parent 6e0fee80294eeb51f209dbc337371894fcaa9e7b
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#
Boris Feld a écrit :
# HG changeset patch
# User Boris Feld
# Date 1507481414 -7200
# Sun Oct 08 18:50:14 2017 +0200
# Node ID c7b1a3b41823e4e4969e17feefaaede4c89fe48c
# Parent 7a2a2f58094560b307ba7980904dd4fc0087eddb
# EXP-Topic b2.phases.hooks
# Available At https://bitbucket.org/octobus
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
With a future chg change, `req.repo` could be set and currently it is
unaffected by `--pager=on`. This patch makes it so.
This could make one of the test cases
durham updated this revision to Diff 2536.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D945?vs=2446&id=2536
REVISION DETAIL
https://phab.mercurial-scm.org/D945
AFFECTED FILES
hgext/fsmonitor/__init__.py
CHANGE DETAILS
diff --git a/hgext/fsmonitor/
Boris Feld a écrit :
# HG changeset patch
# User Boris Feld
# Date 1507305216 -7200
# Fri Oct 06 17:53:36 2017 +0200
# Node ID ab0796c0fbce5d8314511bf08ea5b6b4cf0b9dfc
# Parent 1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/
quark updated this revision to Diff 2537.
quark edited the summary of this revision.
quark retitled this revision from "patch: invalidate messages after encoding
change" to "patch: do not cache translated messages (API)".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercur
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
test-copytrace-heuristics.t tests the heuristics algorithm of copytracing. The
test has a pattern of making a server repo first and then cloning into a local
repo
pulkit updated this revision to Diff 2539.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D987?vs=2522&id=2539
REVISION DETAIL
https://phab.mercurial-scm.org/D987
AFFECTED FILES
mercurial/configitems.py
mer
On Tue, Oct 10, 2017 at 12:10 AM, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507218176 -7200
> # Thu Oct 05 17:42:56 2017 +0200
> # Node ID c60eccc28286bdb8f962b75b7dab0fa87c6abb7d
> # Parent 5657c12f1f9ef4190f390a50194d5e614e67b8c8
> # EXP-Topic obsfatekeyword
>
On Tue, Oct 10, 2017 at 12:10 AM, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507209918 -7200
> # Thu Oct 05 15:25:18 2017 +0200
> # Node ID 1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
> # Parent 14824410b05da8d360ddd65c1f8727cc3bafb111
> # EXP-Topic obsfatekeyword
>
On Tue, Oct 10, 2017 at 12:10 AM, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507305216 -7200
> # Fri Oct 06 17:53:36 2017 +0200
> # Node ID ab0796c0fbce5d8314511bf08ea5b6b4cf0b9dfc
> # Parent 1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
> # EXP-Topic obsfatekeyword
>
On Mon, Oct 09, 2017 at 10:22:00AM +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507493267 -7200
> # Sun Oct 08 22:07:47 2017 +0200
> # Node ID 26ed1b03a337b254a361a09c21839689011b1593
> # Parent 4b8ab80c7f80c391134393fc3a28ea5746dc7807
> # EXP-Topic config.re
On Mon, Oct 09, 2017 at 02:38:04AM -0700, Kostia Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi
> # Date 1507541423 25200
> # Mon Oct 09 02:30:23 2017 -0700
> # Node ID aa5c7de6a86ba8bbc7d46bb414ac7ee6fbde3a4a
> # Parent a57c938e7ac8f391a62de6c7c4d5cf0e81b2dcf4
> windows:
On Sat, Oct 07, 2017 at 10:19:33PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1507381630 -32400
> # Sat Oct 07 22:07:10 2017 +0900
> # Node ID f2a8ec9a8d9bd7c85e3d605543766c756d898d8f
> # Parent 5584116d8f7136476f2ea835277568c372f0c866
> chg: just fo
On Wed, Oct 04, 2017 at 11:53:57PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1506924033 -3600
> # Mon Oct 02 07:00:33 2017 +0100
> # Node ID e6986d59d73bb743c87856bf5ea1a4d869569b8f
> # Parent fecbf1e8aa17474f448e126697fe287e44c92664
> test-basic: m
On Sat, Oct 07, 2017 at 01:05:58AM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1506758270 -3600
> # Sat Sep 30 08:57:50 2017 +0100
> # Node ID 5584116d8f7136476f2ea835277568c372f0c866
> # Parent 099e1c38ca3b261be0b89298356a1ec5ff9d32b5
> templatekw: a
On Wed, Oct 04, 2017 at 11:12:47PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1506856910 -3600
> # Sun Oct 01 12:21:50 2017 +0100
> # Node ID 82606a8703b6f3b297fd0ed6d3e45e43ecd548de
> # Parent b3a36705720f5ed1e7cc5129b27450ca59c7952b
> extdata: show
On Mon, Oct 09, 2017 at 08:54:54PM -0400, Augie Fackler wrote:
> On Mon, Oct 09, 2017 at 02:38:04AM -0700, Kostia Balytskyi wrote:
> > # HG changeset patch
> > # User Kostia Balytskyi
> > # Date 1507541423 25200
> > # Mon Oct 09 02:30:23 2017 -0700
> > # Node ID aa5c7de6a86ba8bbc7d46bb414ac7e
quark abandoned this revision.
quark added a comment.
I'm not sure if it's worth adding more config options. Maybe just make it the
user's responsibility since they can always pipe the output to a pager, or use
`--pager=on`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercuria
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7df85ba72620: tests: add a test demonstrating basic path
conflict failures (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe68deea20e9a: scmutil: handle conflicting files and dirs in
origbackuppath (authored by mbthomas, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D680?vs=2350&id=2543#toc
REPOSI
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2459427e7f57: merge: add pathconflict merge state (authored
by mbthomas, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D774?vs=2351&id=2545#toc
REPOSITORY
rHG Mercurial
CHA
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG48d83ba649e1: merge: add _checkunknowndirs function for
detecting path conflicts (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG57b888b9c75a: merge: add merge action 'pr' to
rename files during update (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D777
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbb8928212e3a: merge: backup conflicting directories when
getting files (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D778?v
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGffe96bac3237: commands: update the resolve command to
handle path conflicts (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG337512875503: merge: add merge action 'p' to
record path conflicts during update (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe0358a9633a9: merge: rename conflicts to fileconflicts in
_checkunknownfiles (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/
On Wed, Oct 04, 2017 at 05:03:59PM +0200, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde
> # Date 1506442667 -7200
> # Tue Sep 26 18:17:47 2017 +0200
> # Node ID 3d8ed7dafee4676b49922a3dde0edf1b1fad63ec
> # Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
> # Available At
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcac23f64fd66: tests: add test for path conflicts during
merge (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D787?vs=2364&id
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG67c075d6cec1: merge: improve error messages for path
conflicts during update (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcac23f64fd66: tests: add test for path conflicts during
merge (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D787?vs=2364&id
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc7d5642811ac: tests: add test for path conflicts during
update (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D786?vs=2363&i
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG33acbd671554: context: also consider path conflicts when
clearing unknown files (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.o
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG61bca39f126d: merge: check for path conflicts when updating
(issue5628) (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D781?
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfd912d81b319: merge: check for path conflicts when merging
(issue5628) (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D784?v
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb8b2804ba00d: util: add safename function for generating
safe names to rename to (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG97a3968f0eb3: merge: improve comments in
mergestate._makerecords (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D955?vs=2465
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb6fa2e0d50d1: commands: tidy up merge state decoding in
resolve (authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D861?vs=2365&
On Mon, 09 Oct 2017 07:08:29 -0400, Paul Morelle
wrote:
On 10/08/2017 08:02 AM, Yuya Nishihara wrote:
+current_branch = repo[None].branch()
if (util.safehasattr(repo, 'mq') and p2 != nullid
and p2 in [x.node for x in repo.mq.applied]):
urev = p2
+elif current_b
On Mon, 09 Oct 2017 05:38:04 -0400, Kostia Balytskyi
wrote:
# HG changeset patch
# User Kostia Balytskyi
# Date 1507541423 25200
# Mon Oct 09 02:30:23 2017 -0700
# Node ID aa5c7de6a86ba8bbc7d46bb414ac7ee6fbde3a4a
# Parent a57c938e7ac8f391a62de6c7c4d5cf0e81b2dcf4
windows: add an experim
On Mon, 09 Oct 2017 20:54:54 -0400, Augie Fackler wrote:
On Mon, Oct 09, 2017 at 02:38:04AM -0700, Kostia Balytskyi wrote:
# HG changeset patch
# User Kostia Balytskyi
# Date 1507541423 25200
# Mon Oct 09 02:30:23 2017 -0700
# Node ID aa5c7de6a86ba8bbc7d46bb414ac7ee6fbde3a4a
# Parent a5
On Tue, 2017-10-10 at 02:41 +0530, Pulkit Goyal wrote:
> On Tue, Oct 10, 2017 at 12:10 AM, Boris Feld
> wrote:
> > # HG changeset patch
> > # User Boris Feld
> > # Date 1507218176 -7200
> > # Thu Oct 05 17:42:56 2017 +0200
> > # Node ID c60eccc28286bdb8f962b75b7dab0fa87c6abb7d
> > # Parent
On Tue, 2017-10-10 at 03:00 +0530, Pulkit Goyal wrote:
> On Tue, Oct 10, 2017 at 12:10 AM, Boris Feld
> wrote:
> > # HG changeset patch
> > # User Boris Feld
> > # Date 1507209918 -7200
> > # Thu Oct 05 15:25:18 2017 +0200
> > # Node ID 1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
> > # Parent
Augie Fackler a écrit :
On Wed, Oct 04, 2017 at 05:03:59PM +0200, Denis Laxalde wrote:
# HG changeset patch
# User Denis Laxalde
# Date 1506442667 -7200
# Tue Sep 26 18:17:47 2017 +0200
# Node ID 3d8ed7dafee4676b49922a3dde0edf1b1fad63ec
# Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
#
84 matches
Mail list logo