facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-12 09:48:05 +03:00
Code Issues Projects Releases Wiki Activity
aaf26c23ca
sapling/edenscm/hgext
History
Arun Kulshreshtha aaf26c23ca movement: pass --merge flag to update from prev/next 
Summary: We weren't passing the `--merge` flag from `hg prev` and `hg next` to the underlying invocation of `hg update`. This diff fixes the problem so that `--merge` now works as expected.

Reviewed By: DurhamG

Differential Revision: D14154244

fbshipit-source-id: 4a2412cca714ec8f269eb5f2989e39821642fbb3
2019-02-20 13:49:08 -08:00
..
absorb codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
amend movement: pass --merge flag to update from prev/next 2019-02-20 13:49:08 -08:00
commitcloud infinitepush - prepare the code to use 'known' wireprotocol request for 2019-02-19 08:48:07 -08:00
convert convert: drop monotone support 2019-02-12 21:45:13 -08:00
extlib revisionstore: add a Store trait 2019-02-19 12:18:27 -08:00
fastannotate codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fastmanifest codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fsmonitor fsmonitor: use correct length for number of files changed 2019-02-18 10:03:12 -08:00
hgevents codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
hggit rust: move bindings to a single python extension 2019-02-01 17:53:22 -08:00
hgsubversion codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
highlight codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
infinitepush infinitepush - prepare the code to use 'known' wireprotocol request for 2019-02-19 08:48:07 -08:00
lfs hg: fix lfs and journal extension postshare wrapping 2019-02-07 18:58:40 -08:00
p4fastimport codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
perfsuite doc: fix rst format 2019-01-30 14:57:42 -08:00
pushrebase pushrebase: backout change to preload the manifest 2019-02-20 13:44:51 -08:00
remotefilelog revisionstore: verify repacked keys before deleting pack files 2019-02-14 13:03:09 -08:00
repogenerator codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
treemanifest treemanifest: use simplecache as a cache store 2019-02-07 04:59:48 -08:00
__init__.py codemod: move Python packages to edenscm 2019-01-28 18:35:41 -08:00
arcdiff.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
automv.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
blackbox.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
catnotate.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
checkmessagehook.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
chistedit.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
churn.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
cleanobsstore.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
clienttelemetry.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
clindex.pyx codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
clonebundles.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
commitextras.py test-revset: do not use "hg branch" directly 2019-02-14 17:44:39 -08:00
conflictinfo.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
copytrace.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
crdump.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
debugcommitmessage.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
debugshell.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
dialect.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
directaccess.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
dirsync.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
disablesymlinks.py disablesymlinks: add extension to disable symlinks 2019-02-06 08:41:34 -08:00
drop.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
edrecord.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
eol.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
errorredirect.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
extdiff.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
extorder.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
extutil.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fastlog.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fbconduit.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fbhistedit.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fetch.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
fixcorrupt.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
generic_bisect.py codemod: move Python packages to edenscm 2019-01-28 18:35:41 -08:00
githelp.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
gitlookup.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
gitrevset.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
globalrevs.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
gpg.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
grepdiff.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
grpcheck.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
hgsql.py hgsql: fix hggit sync 2019-02-11 13:47:12 -08:00
hiddenerror.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
histedit.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
infinitepushbackup.py infinitepush - prepare the code to use 'known' wireprotocol request for 2019-02-19 08:48:07 -08:00
interactiveui.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
journal.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
linkrevcache.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
logginghelper.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
lz4revlog.py rust: move bindings to a single python extension 2019-02-01 17:53:22 -08:00
mergedriver.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
morecolors.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
morestatus.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
myparent.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
nointerrupt.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
ownercheck.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
patchrmdir.pyx codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
phabdiff.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
phabstatus.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
phrevset.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
progressfile.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
pullcreatemarkers.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
purge.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
rage.py rage: read fsmonitor state from treestate 2019-02-20 11:01:52 -08:00
rebase.py rebase: remove --keepbranches flag 2019-02-12 21:45:10 -08:00
remotenames.py remotenames: treat query strings and fragments as parameters 2019-02-14 03:21:53 -08:00
reset.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
sampling.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
schemes.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
sendunbundlereplay.py unbundlereplay: do not produce changegroup response part 2019-02-20 08:47:25 -08:00
share.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
shelve.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
sigtrace.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
simplecache.py lazy connection open for memcache has an issue with SIGPIPE 2019-02-08 09:44:06 -08:00
smartlog.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
sparse.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
sshaskpass.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
stablerev.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
stat.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
strip.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
traceprof.pyx codemod: move Python packages to edenscm 2019-01-28 18:35:41 -08:00
tweakdefaults.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
undo.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
whereami.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
win32mbcs.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
win32text.py codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00