darcs

Issue 884 put can't succeed because of conflicts, but get succeeds

Title put can't succeed because of conflicts, but get succeeds
Priority bug Status duplicate
Milestone Resolved in
Superseder put can't succeed because of conflicts, but get succeeds
View: 883
Nosy List darcs-devel, dmitry.kurochkin, kowey, thorkilnaur, tommy, zooko
Assigned To
Topics

Created on 2008-05-28.13:12:40 by zooko, last changed 2009-08-27.13:59:57 by admin.

Messages
msg4872 (view) Author: zooko Date: 2008-05-28.13:12:37
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
msg4873 (view) Author: zooko Date: 2008-05-28.14:03:40
duplicate of issue883 (duplicated by that roundup email bug)
History
Date User Action Args
2008-05-28 13:12:40zookocreate
2008-05-28 14:03:41zookosetpriority: bug
status: unread -> duplicate
superseder: + put can't succeed because of conflicts, but get succeeds
messages: + msg4873
nosy: tommy, beschmi, zooko, dagit
2009-08-06 21:06:13adminsetnosy: + dmitry.kurochkin, simon, kowey, thorkilnaur, - beschmi
2009-08-11 00:15:33adminsetnosy: - dagit
2009-08-25 18:11:30adminsetnosy: + darcs-devel, - simon
2009-08-27 13:59:57adminsetnosy: tommy, kowey, darcs-devel, zooko, thorkilnaur, dmitry.kurochkin