date:20211020

D11707: fsmonitor: fix traceback after removal of nonnormalset (issue6600)

2021-10-20 Thread Raphaël Gomès

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This basically does the same thing it used to do, but in the only place it's
  needed.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11707

AFFECTED FILES
  hgext/fsmonitor/__init__.py

CHANGE DETAILS

diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -333,7 +333,11 @@
 # for better performance, directly access the inner dirstate map if the
 # standard dirstate implementation is in use.
 dmap = dmap._map
-nonnormalset = self._map.nonnormalset
+nonnormalset = {
+f
+for f, e in self._map.items()
+if e.v1_state() != "n" or e.v1_mtime() == -1
+}
 
 copymap = self._map.copymap
 getkind = stat.S_IFMT



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11708: fsmonitor: fix traceback about bytes and str incompatibility

2021-10-20 Thread Raphaël Gomès

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This didn't work anymore in Python 3, switching to a `repr` based reporting 
does

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11708

AFFECTED FILES
  hgext/fsmonitor/__init__.py

CHANGE DETAILS

diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -564,8 +564,8 @@
 for i, (s1, s2) in enumerate(zip(l1, l2)):
 if set(s1) != set(s2):
 f.write(b'sets at position %d are unequal\n' % i)
-f.write(b'watchman returned: %s\n' % s1)
-f.write(b'stat returned: %s\n' % s2)
+f.write(b'watchman returned: %r\n' % s1)
+f.write(b'stat returned: %r\n' % s2)
 finally:
 f.close()
 



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: Removing the Windows CI workers

2021-10-20 Thread Raphaël Gomès



On 9/30/21 12:19 PM, Marcus Harnisch wrote:

On 29/09/2021 11.39, Raphaël Gomès wrote:
Earlier this month, OVH which provided free VMs for my company 
Octobus has started billing us with no real notice. This wasn't a 
surprise however, since we were in a "grace period" of sorts and 
could expect the billing to start at any moment, we just hoped it 
would be later in the year.


I just happened to stumble across this thread and shortly after, an 
article about about Microsoft's Azure Credits program 
(https://opensource.microsoft.com/azure-credits)


Could that be useful?

This could certainly be useful, we haven't had time to look into it but 
should do so shortly, thanks. :)

Cheers,
Marcus

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: Removing the Windows CI workers

2021-10-20 Thread Raphaël Gomès

Thanks for reaching out Greg (sorry for not having answered sooner), 
I'll try to find some time soon to discuss this.


Raph

On 9/30/21 3:55 AM, Gregory Szorc wrote:
On Wed, Sep 29, 2021 at 2:41 AM Raphaël Gomès 
mailto:raphael.go...@octobus.net>> wrote:


Hi all,

I am bringing unfortunate news, though I hope this situation is
temporary.

Earlier this month, OVH which provided free VMs for my company
Octobus
has started billing us with no real notice. This wasn't a surprise
however, since we were in a "grace period" of sorts and could
expect the
billing to start at any moment, we just hoped it would be later in
the year.

Four of those VMs were used exclusively for Mercurial's Windows CI in
order to help the project move forward and truly support Windows
(especially on Python 3). Unfortunately, this new regular
financial load
adds up on top of the rest of the investment our small company
puts into
Mercurial - whether it be developer time for projects like
Heptapod or
directly on Mercurial like bug fixes, code review, etc. - and is not
sustainable for us at the moment.

I have already stopped two of the four machines earlier this week and
will remove the last two tomorrow (30th of September), meaning
that we
will not have any regular Windows CI for the project anymore.

I've sent https://phab.mercurial-scm.org/D11499
 to adjust the CI file to
not break every pipeline from now on, hopefully it can be queue
before that.

We're trying to figure out ways of gaining back Windows VMs (and
actually for other OSes as well) in a more sustainable manner, if you
know of anyone that could help, please reach out.


I've been running https://ci.hg.gregoryszorc.com/ 
 for the past few years out of my own 
pocket. I was actually thinking about turning it off since it seems to 
be redundant with the superior Octobus CI and it is costing me a good 
chunk of money. But maybe I should keep it around?


What's the monthly cost to run the Windows CI workers? How many CPU 
cores / memory do you need? What's the total CPU/wall time we're 
talking about here? If we cut down Windows CI to just run on pushes to 
hg-committed, I feel like we can reduce the cost to something reasonable.


(Feel free to drop the list if you want to discuss privately.)

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: Removing the Windows CI workers

2021-10-20 Thread Raphaël Gomès

After more exchanges with the OVH people, we've just managed to get an 
extension of our free resources until the 2nd of January 2022, which 
should buy us more time to find alternate solutions.


I'm going to be spinning up VMs today, which come right in time for the 
5.9.3 and 6.0 releases we're planning this week.


Raphaël

On 9/29/21 11:39 AM, Raphaël Gomès wrote:

Hi all,

I am bringing unfortunate news, though I hope this situation is 
temporary.


Earlier this month, OVH which provided free VMs for my company Octobus 
has started billing us with no real notice. This wasn't a surprise 
however, since we were in a "grace period" of sorts and could expect 
the billing to start at any moment, we just hoped it would be later in 
the year.


Four of those VMs were used exclusively for Mercurial's Windows CI in 
order to help the project move forward and truly support Windows 
(especially on Python 3). Unfortunately, this new regular financial 
load adds up on top of the rest of the investment our small company 
puts into Mercurial - whether it be developer time for projects like 
Heptapod or directly on Mercurial like bug fixes, code review, etc. - 
and is not sustainable for us at the moment.


I have already stopped two of the four machines earlier this week and 
will remove the last two tomorrow (30th of September), meaning that we 
will not have any regular Windows CI for the project anymore.


I've sent https://phab.mercurial-scm.org/D11499 to adjust the CI file 
to not break every pipeline from now on, hopefully it can be queue 
before that.


We're trying to figure out ways of gaining back Windows VMs (and 
actually for other OSes as well) in a more sustainable manner, if you 
know of anyone that could help, please reach out.


Thanks,
Raphaël

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial-devel | Failed pipeline for branch/stable | eec22d55

2021-10-20 Thread Heptapod



Pipeline #28033 has failed!

Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel )
Branch: branch/stable ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/stable )

Commit: eec22d55 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/eec22d55230ea96951e7e9fdd2499e5b0987de9c
 )
Commit Message: merge-halt: fix issue with merge.on-failure=hal...
Commit Author: Kyle Lippincott ( https://foss.heptapod.net/spectral )

Pipeline #28033 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/pipelines/28033 ) 
triggered by Administrator ( https://foss.heptapod.net/root )
had 3 failed jobs.

Job #255978 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/255978/raw )

Stage: tests
Name: windows-py3
Job #255977 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/255977/raw )

Stage: tests
Name: check-pytype-py3
Job #255979 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/255979/raw )

Stage: tests
Name: windows-py3-pyox

-- 
You're receiving this email because of your account on foss.heptapod.net.



___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11709: dirstate-v2: freeze the on-disk format

2021-10-20 Thread marmoute (Pierre-Yves David)

marmoute created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
marmoute added a comment.


  Lets put the option on the table.

REVISION SUMMARY
  It seems the format as reached a good balance. With a core of new capabilities
  that motivated it initially and enough new feature and room for future
  improvement to be a clear progress we can set a milestone for.
  
  Having the format frozen will help the feature to get real life testing, 
outside
  of the test suite.
  
  The feature itself stay experimental but the config gains a new name to avoid
  people enable non-frozen version by default.
  
  If too many bugs are reported during the RC we might move the format back to
  experimental and drop its support in future version (in favor of a new one)

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11709

AFFECTED FILES
  mercurial/configitems.py
  mercurial/localrepo.py
  mercurial/requirements.py
  mercurial/upgrade_utils/actions.py
  rust/hg-core/src/requirements.rs
  tests/test-basic.t
  tests/test-commandserver.t
  tests/test-dirstate-race.t
  tests/test-dirstate-race2.t
  tests/test-dirstate.t
  tests/test-hgignore.t
  tests/test-init.t
  tests/test-lfconvert.t
  tests/test-lfs-largefiles.t
  tests/test-narrow-clone-no-ellipsis.t
  tests/test-narrow-clone-stream.t
  tests/test-narrow-clone.t
  tests/test-narrow-sparse.t
  tests/test-permissions.t
  tests/test-persistent-nodemap.t
  tests/test-phases.t
  tests/test-purge.t
  tests/test-remotefilelog-clone-tree.t
  tests/test-remotefilelog-clone.t
  tests/test-remotefilelog-log.t
  tests/test-repo-compengines.t
  tests/test-requires.t
  tests/test-revlog-v2.t
  tests/test-share-safe.t
  tests/test-sparse-requirement.t
  tests/test-sqlitestore.t
  tests/test-status.t
  tests/test-stream-bundle-v2.t
  tests/test-symlinks.t
  tests/test-upgrade-repo.t

CHANGE DETAILS

diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t
--- a/tests/test-upgrade-repo.t
+++ b/tests/test-upgrade-repo.t
@@ -1638,7 +1638,7 @@
 
 Upgrade to dirstate-v2
 
-  $ hg debugformat -v --config format.exp-dirstate-v2=1
+  $ hg debugformat -v --config format.exp-rc-dirstate-v2=1
   format-variant repo config default
   fncache:yesyes yes
   dirstate-v2: noyes  no
@@ -1653,12 +1653,12 @@
   plain-cl-delta: yesyes yes
   compression:zstd   zstdzstd
   compression-level:  default default default
-  $ hg debugupgraderepo --config format.exp-dirstate-v2=1 --run
+  $ hg debugupgraderepo --config format.exp-rc-dirstate-v2=1 --run
   upgrade will perform the following actions:
   
   requirements
  preserved: dotencode, exp-revlogv2.2, fncache, generaldelta, 
persistent-nodemap, revlog-compression-zstd, sparserevlog, store
- added: exp-dirstate-v2
+ added: dirstate-v2
   
   dirstate-v2
  "hg status" will be faster
@@ -1703,7 +1703,7 @@
   
   requirements
  preserved: dotencode, exp-revlogv2.2, fncache, generaldelta, 
persistent-nodemap, revlog-compression-zstd, sparserevlog, store
- removed: exp-dirstate-v2
+ removed: dirstate-v2
   
   processed revlogs:
 - all-filelogs
diff --git a/tests/test-symlinks.t b/tests/test-symlinks.t
--- a/tests/test-symlinks.t
+++ b/tests/test-symlinks.t
@@ -5,7 +5,7 @@
 #if dirstate-v2
   $ cat >> $HGRCPATH << EOF
   > [format]
-  > exp-dirstate-v2=1
+  > exp-rc-dirstate-v2=1
   > [storage]
   > dirstate-v2.slow-path=allow
   > EOF
diff --git a/tests/test-stream-bundle-v2.t b/tests/test-stream-bundle-v2.t
--- a/tests/test-stream-bundle-v2.t
+++ b/tests/test-stream-bundle-v2.t
@@ -48,12 +48,12 @@
   stream2 -- {bytecount: 1693, filecount: 11, requirements: 
dotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Csparserevlog%2Cstore} 
(mandatory: True) (no-zstd !)
   stream2 -- {bytecount: 1693, filecount: 11, requirements: 
dotencode%2Cfncache%2Cgeneraldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog%2Cstore}
 (mandatory: True) (zstd no-rust !)
   stream2 -- {bytecount: 1693, filecount: 11, requirements: 
dotencode%2Cfncache%2Cgeneraldelta%2Cpersistent-nodemap%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog%2Cstore}
 (mandatory: True) (rust no-dirstate-v2 !)
-  stream2 -- {bytecount: 1693, filecount: 11, requirements: 
dotencode%2Cexp-dirstate-v2%2Cfncache%2Cgeneraldelta%2Cpersistent-nodemap%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog%2Cstore}
 (mandatory: True) (dirstate-v2 !)
+  stream2 -- {bytecount: 1693, filecount: 11, requirements: 
dotencode%2Cexp-rc-dirstate-v2%2Cfncache%2Cgeneraldelta%2Cpersistent-nodemap%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog%2Cstore}
 (mandatory: True) (dirstate-v2 !)
   $ hg debugbundle --spec bundle.hg
   
none-v2;stream=v2;requirements%3Ddotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Csparserevlog%2Cstore
 (no-zstd !)
   
none-v2;stream=v2;requirements%3Ddotencode%

D11710: pyoxidizer: force pip to not use pep517 in order to still be able to install hg

2021-10-20 Thread Raphaël Gomès

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Mercurial is not (yet) a pep517 package, but the presence of a pyproject.toml
  file tells newer-ish versions of pip that it should be one.
  
  This is related to 58fe6d127a01 
, 
and fixes pyoxidizer builds for the Heptapod
  CI.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11710

AFFECTED FILES
  rust/hgcli/pyoxidizer.bzl

CHANGE DETAILS

diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl
--- a/rust/hgcli/pyoxidizer.bzl
+++ b/rust/hgcli/pyoxidizer.bzl
@@ -122,7 +122,7 @@
 )
 
 # Add Mercurial to resources.
-exe.add_python_resources(exe.pip_install(["--verbose", ROOT]))
+exe.add_python_resources(exe.pip_install(["--verbose", "--no-use-pep517", 
ROOT]))
 
 # On Windows, we install extra packages for convenience.
 if IS_WINDOWS:



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial-devel | Failed pipeline for branch/stable | c02d5c1f

2021-10-20 Thread Heptapod



Pipeline #28047 has failed!

Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel )
Branch: branch/stable ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/stable )

Commit: c02d5c1f ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/c02d5c1f274a60ee7d296190b3a2a7e21d030f5d
 )
Commit Message: pyoxidizer: force pip to not use pep517 in orde...
Commit Author: Raphaël Gomès

Pipeline #28047 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/pipelines/28047 ) 
triggered by Administrator ( https://foss.heptapod.net/root )
had 3 failed jobs.

Job #256101 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/256101/raw )

Stage: tests
Name: check-pytype-py3
Job #256088 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/256088/raw )

Stage: tests
Name: checks-py2
Job #256089 ( 
https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/256089/raw )

Stage: tests
Name: checks-py3

-- 
You're receiving this email because of your account on foss.heptapod.net.



___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11711: parsers: don't ask about the exec bit on platforms that don't have it

2021-10-20 Thread Raphaël Gomès

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Otherwise the compiler gets quite sad.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11711

AFFECTED FILES
  mercurial/cext/parsers.c

CHANGE DETAILS

diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c
--- a/mercurial/cext/parsers.c
+++ b/mercurial/cext/parsers.c
@@ -260,11 +260,16 @@
 {
int flags = self->flags;
int mode = dirstate_item_c_v1_mode(self);
+#ifdef S_IXUSR
+   /* This is for platforms with an exec bit */
if ((mode & S_IXUSR) != 0) {
flags |= dirstate_flag_mode_exec_perm;
} else {
flags &= ~dirstate_flag_mode_exec_perm;
}
+#else
+   flags &= ~dirstate_flag_mode_exec_perm;
+#endif
if (S_ISLNK(mode)) {
flags |= dirstate_flag_mode_is_symlink;
} else {



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11712: parsers: don't ask about symlinks on platforms that don't support them

2021-10-20 Thread Raphaël Gomès

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Otherwise the compiler gets quite sad.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11712

AFFECTED FILES
  mercurial/cext/parsers.c

CHANGE DETAILS

diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c
--- a/mercurial/cext/parsers.c
+++ b/mercurial/cext/parsers.c
@@ -270,11 +270,16 @@
 #else
flags &= ~dirstate_flag_mode_exec_perm;
 #endif
+#ifdef S_ISLNK
+   /* This is for plaforms with support for symlinks */
if (S_ISLNK(mode)) {
flags |= dirstate_flag_mode_is_symlink;
} else {
flags &= ~dirstate_flag_mode_is_symlink;
}
+#else
+   flags &= ~dirstate_flag_mode_is_symlink;
+#endif
return Py_BuildValue("", flags, self->size, self->mtime_s,
 self->mtime_ns);
 };



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11713: dirstate: add missing return on platforms without exec or symlink

2021-10-20 Thread Raphaël Gomès

Alphare 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/D11713

AFFECTED FILES
  mercurial/dirstate.py

CHANGE DETAILS

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -300,6 +300,8 @@
 return b''
 return fallback(x)
 
+return f
+
 @propertycache
 def _cwd(self):
 # internal config: ui.forcecwd



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11714: tests: fix test-convert-git to work w/ "git pull" requiring strategy

2021-10-20 Thread spectral (Kyle Lippincott)

spectral created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  A recent change to git (031e2f7ae195) made it an error to not specify a 
strategy
  (`--rebase`, `--no-rebase`, `--ff-only`), instead of just the warning it was
  previously. As far as I can tell, `--no-rebase` is the behavior we were 
getting
  before, and the only one that makes the test work.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11714

AFFECTED FILES
  tests/test-convert-git.t

CHANGE DETAILS

diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t
--- a/tests/test-convert-git.t
+++ b/tests/test-convert-git.t
@@ -50,7 +50,7 @@
   $ echo a >> a
   $ commit -a -m t4.2
   $ git checkout master >/dev/null 2>/dev/null
-  $ git pull --no-commit . other > /dev/null 2>/dev/null
+  $ git pull --no-commit . other --no-rebase > /dev/null 2>/dev/null
   $ commit -m 'Merge branch other'
   $ cd ..
   $ hg convert --config extensions.progress= --config progress.assume-tty=1 \
@@ -137,7 +137,7 @@
   $ git add baz
   $ commit -a -m 'add baz'
   $ git checkout master >/dev/null 2>/dev/null
-  $ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null
+  $ git pull --no-commit . Bar Baz --no-rebase > /dev/null 2>/dev/null
   $ commit -m 'Octopus merge'
   $ echo bar >> bar
   $ commit -a -m 'change bar'
@@ -145,7 +145,7 @@
   $ echo >> foo
   $ commit -a -m 'change foo'
   $ git checkout master >/dev/null 2>/dev/null
-  $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null
+  $ git pull --no-commit -s ours . Foo --no-rebase > /dev/null 2>/dev/null
   $ commit -m 'Discard change to foo'
   $ cd ..
   $ glog()



To: spectral, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11707: fsmonitor: fix traceback after removal of nonnormalset (issue6600)

D11708: fsmonitor: fix traceback about bytes and str incompatibility

Re: Removing the Windows CI workers

Re: Removing the Windows CI workers

Re: Removing the Windows CI workers

mercurial-devel | Failed pipeline for branch/stable | eec22d55

D11709: dirstate-v2: freeze the on-disk format

D11710: pyoxidizer: force pip to not use pep517 in order to still be able to install hg

mercurial-devel | Failed pipeline for branch/stable | c02d5c1f

D11711: parsers: don't ask about the exec bit on platforms that don't have it

D11712: parsers: don't ask about symlinks on platforms that don't support them

D11713: dirstate: add missing return on platforms without exec or symlink

D11714: tests: fix test-convert-git to work w/ "git pull" requiring strategy

13 matches

Site Navigation

Mail list logo

Footer information