Issue 1901 Cannot apply patch from bundle, but can pull it

Title Cannot apply patch from bundle, but can pull it
Priority urgent Status duplicate
Milestone Resolved in
Superseder apply => failed to read patch (NewSet related?)
View: 1873
Nosy List dmitry.kurochkin, tux_rocker
Assigned To
Topics Regression

Created on 2010-08-02.18:51:26 by tux_rocker, last changed 2010-08-02.19:37:26 by tux_rocker.

File name Uploaded Type Edit Remove
2.5-issue1901.ctx tux_rocker, 2010-08-02.18:54:58 chemical/x-ctx
head-issue1901.ctx tux_rocker, 2010-08-02.18:55:21 chemical/x-ctx
msg11915 (view) Author: tux_rocker Date: 2010-08-02.18:51:25
When trying to apply Petr's issue1888 patch to the 2.5 branch, I get a
message that darcs failed to read a certain patch. When I apply the
patch to the HEAD branch however, and then pull from the 2.5 branch, it
applies just fine.

The complete interaction showing the application to HEAD, the failure to
apply to the 2.5 branch and the successful pull:

reinier@adim:~/Sources/darcs-staging$ darcs apply
Finished applying...
reinier@adim:~/Sources/darcs-staging$ cd ../branch-2.5
reinier@adim:~/Sources/branch-2.5$ darcs apply
darcs: failed to read patch:
Wed Jul  7 20:02:10 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * standardize GHC options
Patch not stored in patch bundle:
Wed Jul  7 20:02:10 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * standardize GHC options
reinier@adim:~/Sources/branch-2.5$ darcs pull ../darcs-staging -p
'Resolve issue1888'
Thu Jul 29 20:51:43 CEST 2010  Petr Rockai <me@mornfall.net>
  * Resolve issue1888: fix changes --context.
Shall I pull this patch? (1/1)  [ynW...], or ? for more options: y
Backing up ./src/Darcs/Commands/Changes.lhs(-darcs-backup0)
We have conflicts in the following files:
Finished pulling and applying.
msg11916 (view) Author: tux_rocker Date: 2010-08-02.18:54:58
Attaching the context files of both repos as they were before the
command sequence in the above post.
msg11917 (view) Author: tux_rocker Date: 2010-08-02.18:58:13
As you can see, the branch-2.5 repository I was applying it to had local
modifications that conflicted. I can, however, reproduce it without
local modifications.
msg11918 (view) Author: tux_rocker Date: 2010-08-02.19:06:47
darcs 2.4.1 tells me:

darcs: Cannot apply this patch bundle, since we're missing:
Thu Jul 22 13:14:10 CEST 2010  Petr Rockai <me@mornfall.net>
  * Slightly fix context generation in Setup.

which is much better. So it's a regression.
Date User Action Args
2010-08-02 18:51:26tux_rockercreate
2010-08-02 18:54:58tux_rockersetfiles: + 2.5-issue1901.ctx
messages: + msg11916
2010-08-02 18:55:21tux_rockersetfiles: + head-issue1901.ctx
2010-08-02 18:58:14tux_rockersetmessages: + msg11917
2010-08-02 19:06:48tux_rockersettopic: + Regression
messages: + msg11918
2010-08-02 19:37:14tux_rockersetstatus: needs-reproduction -> duplicate
superseder: + apply => failed to read patch (NewSet related?)
2010-08-02 19:37:26tux_rockersetmilestone: 2.5.0 ->