Mercurial > hg
view tests/test-mq-missingfiles.out @ 8345:dcebff8a25dd
hgwebdir: read --webdir-conf as actual configuration to ui (issue1586)
This cleans up code and allows specification of values more globally. For
example, it's now possible to specify web.contact in webdir-conf for all
repositories without a specified contact set.
author | Alexander Solovyov <piranha@piranha.org.ua> |
---|---|
date | Mon, 11 May 2009 14:20:18 +0200 |
parents | fb32ae9c76e7 |
children | a96b049075a8 |
line wrap: on
line source
adding b patch queue now empty % push patch with missing target applying changeb unable to find 'b' for patching 2 out of 2 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh changeb % display added files a c % display rejections --- b +++ b @@ -1,3 +1,5 @@ +b +b a a a @@ -8,3 +10,5 @@ a a a +c +c adding b patch queue now empty % push git patch with missing target applying changeb unable to find 'b' for patching 1 out of 1 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) b: No such file or directory b not tracked! patch failed, rejects left in working dir errors during apply, please fix and refresh changeb ? b.rej % display added files a c % display rejections --- b +++ b GIT binary patch literal 2 Jc${No0000400IC2 % test push creating directory during git copy or rename adding a patch queue now empty applying patch now at: patch