Mercurial > hg
view tests/test-batching.py.out @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
parents | 4c706037adef |
children | 33a6eee08db2 |
line wrap: on
line source
== Local Ready. Un and Deux Eins und Zwei One and Two Eins und Zwei Uno und Due proper end of results generator == Remote Ready. REQ: foo?one=Vo&two=Efvy -> Vo!boe!Efvy Un and Deux REQ: bar?b=Fjot&a=[xfj -> Fjot!voe![xfj Eins und Zwei REQ: batch?cmds=foo:one=Pof,two=Uxp;bar:b=Fjot,a=[xfj;bar:b=Vop,a=Evf -> Pof!boe!Uxp;Fjot!voe![xfj;Vop!voe!Evf One and Two Eins und Zwei Uno und Due proper end of results generator Attempted to batch a non-batchable call to 'greet' Attempted to batch a non-batchable call to 'hello'