##// END OF EJS Templates
rebase: fix for hgsubversion...
rebase: fix for hgsubversion 5c25fe7fb1e broke something in the hgsubversion test path, causing it raise an abort (Abort: nothing to merge) during a perfectly good rebase. I tracked it down to this change. It's probably not hgsubversion related. I suspect that using the same `wctx` from before the initial update causes problems with the wctx's cached manifest property. I noticed we also sometimes stick random gunk on the wctx object in other places (like in `copies.py`) so it's probably best to reset it for now. The line I added before was actually useless since we don't pass wctx to the initial `merge.update`, so it defaults to `repo[None]`. So I just removed it. Differential Revision: https://phab.mercurial-scm.org/D1679

File last commit:

r20622:352abbb0 default
r35411:83014fa9 default
Show More
linux-vfat
27 lines | 443 B | text/plain | TextLexer
# invalid filenames
test-add.t
test-init.t
test-clone.t
test-contrib.t
test-hgweb-raw.t
test-walk.t
# no sockets or fifos
test-hup.t
# no hardlinks
test-hardlinks.t
test-relink.t
# exec bit problems
test-convert-bzr-114.t
test-convert-bzr-directories.t
test-convert-bzr-merges.t
test-convert-bzr-treeroot.t
test-convert-darcs.t
test-merge-tools.t
# debugstate exec bit false positives
test-dirstate.t
test-filebranch.t
test-merge-remove.t