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

I created an empty repository, set "apply mark-conflicts", and pushed into it,
and got this conflict:

 wonwin-mcbrootles-computer:~/playground/allmydata/tahoe/tmppush$ darcs whatsnew
hunk ./src/allmydata/test/test_system.py 623
+v v v v v v v
+*************
hunk ./src/allmydata/test/test_system.py 626
+^ ^ ^ ^ ^ ^ ^

Can we make this one a wont-fix, on the same principle that pull should allow
for conflicts, but push should not?

I suppose put could use apply --mark-conflicts, on the other hand.

I don't understand -- why does it make sense for "darcs put --repodir=r1
$PWD/r2" to fail but "darcs get --repo-name=r2 r1" to succeed while showing no
conflicts?

I would understand if the latter produced the conflicts.

I guess this implies that I have the same question about why "darcs get
--repo-name=r2 r1" succeeds with no conflicts, but "mkdir r2 && cd r2 && darcs
init && darcs pull -a ../r1" gives a conflict.

If you darcs get the repository and mark-conflicts you should see the same set
of markers.

Maybe this is just a user interface issue with darcs get?  Maybe it is
succeeding in cases of unresolved conflicts when it should be failing (should it
be failing?).

It may be worthwhile to darcs send us a minimal test case in bugs/.  The idea
would be that you create a repository with conflicts, darcs get it and fail if
get succeeds.

Alternatively, get could succeed and politely remind you that there are
unresolved conflicts in the repository.