Hi François,<br><br>following the instructions:<br><br>Backing up ./src/allmydata/scripts/tahoe_backup.py(-darcs-backup0)<br>There are conflicts in the following files:<br>./src/allmydata/scripts/tahoe_backup.py<br><br>darcs failed: Refusing to apply patches leading to conflicts.<br>
If you would rather apply the patch and mark the conflicts,<br>use the --mark-conflicts or --allow-conflicts options to apply<br>These can set as defaults by adding<br> apply mark-conflicts<br>to _darcs/prefs/defaults in the target repo.<br>
<br>Thanks,<br>Andrej<br><br><div class="gmail_quote">On Wed, Feb 25, 2009 at 8:49 PM, Francois Deppierraz <span dir="ltr"><francois@ctrlaltdel.ch></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Hi Andrej,<br>
<div class="Ih2E3d"><br>
Andrej Falout wrote:<br>
<br>
> can you please explain "repository" to an non-Python person?<br>
<br>
</div>Oops, sorry for not being clear enough. It's a darcs repository actually.<br>
<br>
Here is the complete procedure:<br>
<br>
darcs get <a href="http://allmydata.org/source/tahoe/trunk-darcs1format" target="_blank">http://allmydata.org/source/tahoe/trunk-darcs1format</a> tahoe<br>
cd tahoe<br>
wget<br>
<a href="http://allmydata.org/trac/tahoe/raw-attachment/ticket/534/unicode-v2.dpatch" target="_blank">http://allmydata.org/trac/tahoe/raw-attachment/ticket/534/unicode-v2.dpatch</a><br>
darcs apply unicode-v2.dpatch<br>
<div class="Ih2E3d"><br>
> I tried applying patch in the root of the source code, but this failed with:<br>
><br>
> darcs failed: Unable to "darcs apply" here.<br>
> You need to be in a repository directory to run this command.<br>
<br>
</div>Yes, unfortunately, it not a standard patch but a darcs dpatch generated<br>
by darcs send.<br>
<div><div></div><div class="Wj3C7c"><br>
François<br>
_______________________________________________<br>
tahoe-dev mailing list<br>
<a href="mailto:tahoe-dev@allmydata.org">tahoe-dev@allmydata.org</a><br>
<a href="http://allmydata.org/cgi-bin/mailman/listinfo/tahoe-dev" target="_blank">http://allmydata.org/cgi-bin/mailman/listinfo/tahoe-dev</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>Andrej Falout<br>AU: +61 (410) 463 735 NZ: +64 (21) 0256 6825 US: +1 (360) 488 0970<br>