##// END OF EJS Templates
merge: don't auto-pick destination with `hg merge 'wdir()'`...
merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

File last commit:

r44296:b7af8a02 default
r44638:1850066f default
Show More
dirs_corpus.py
29 lines | 717 B | text/x-python | PythonLexer
from __future__ import absolute_import, print_function
import argparse
import zipfile
ap = argparse.ArgumentParser()
ap.add_argument("out", metavar="some.zip", type=str, nargs=1)
args = ap.parse_args()
with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf:
zf.writestr(
"greek-tree",
"\n".join(
[
"iota",
"A/mu",
"A/B/lambda",
"A/B/E/alpha",
"A/B/E/beta",
"A/D/gamma",
"A/D/G/pi",
"A/D/G/rho",
"A/D/G/tau",
"A/D/H/chi",
"A/D/H/omega",
"A/D/H/psi",
]
),
)