wonwin-mcbrootles-computer:~/playground/allmydata/tahoe$ darcs --
version
2.0.0 (2.0.0 (+ 220 patches))
wonwin-mcbrootles-computer:~/playground/allmydata/tahoe$ time darcs
put --repodir=trunk-pristine ${PWD}/tmpput
There are conflicts in the following files:
./src/allmydata/test/test_system.py
darcs failed: Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts or --allow-conflicts options to apply
These can set as defaults by adding
apply mark-conflicts
to _darcs/prefs/defaults in the target repo.
Apply failed!
real 0m38.408s
user 0m33.685s
sys 0m4.577s
wonwin-mcbrootles-computer:~/playground/allmydata/tahoe$ time darcs
get --repo-name=tmpget trunk-pristine
Copying patches, to get lazy repository hit ctrl-C...
Finished getting.
real 0m15.497s
user 0m4.103s
sys 0m1.259s
|