[darcs-devel] [darcs #161] Error applying patch to working dir.
zooko at zooko.com via RT
bugs at darcs.net
Sun Jan 2 13:44:23 PST 2005
Sun Jan 02 16:44:21 2005: New ticket: 161.
Transaction: Ticket created by zooko at zooko.com
Queue: Darcs
Subject: Error applying patch to working dir.
Owner: Nobody
Requestors: zooko at zooko.com
Status: new
Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=161 >
Appended is a screenlog. The repos in question are at
http://zooko.com/repos/private/$DAVIDSSECRETURL/minbug.tar.bz2
If you unpull the patch matching "hook up Cocoa GUI button" before
pulling the patch matching "comment out bad-looking stuff" then the
failure does not happen.
Regards,
Zooko
cd minbug/
HACO yumyum:/tmp/minbug$ l
drwxrwxr-x 4 zooko zooko 96 Jan 2 16:23 ./.
drwxrwxr-x 4 zooko zooko 96 Jan 2 16:30 ./zp
drwxrwxr-x 4 zooko zooko 96 Jan 2 16:33 ./zo
drwxrwxrwt 10 root root 464 Jan 2 16:33 ./..
HACO yumyum:/tmp/minbug$ cd zo/
HACO yumyum:/tmp/minbug/zo$ darcs pull -v ../zp
Pulling from "../zp"...
We have the following new (to them) patches:
Tue Nov 30 13:49:16 AST 2004 zooko at zooko.com
* hook up Cocoa GUI button to the "enter censor mode" feature
Mon Nov 8 20:42:59 AST 2004 dp
* Shtoom: changeset 882
This wants a MediaLayer, not an audio device
They have the following patches to pull:
Fri Dec 17 00:47:40 AST 2004 zooko at zooko.com
* comment out bad-looking stuff in GUI censor -- censo/censor outlet
switch
Fri Dec 17 00:47:40 AST 2004 zooko at zooko.com
* comment out bad-looking stuff in GUI censor -- censo/censor outlet
switch
Shall I pull this patch? (1/1) [ynWvxqadjk], or ? for help: y
Getting and merging the following patches:
[comment out bad-looking stuff in GUI censor -- clear/censor outlet
switch
zooko at zooko.com**20041217044740]
diffing dir...
We have conflicts in the following files:
./Shtoom/CocoaShtoom/ShtoomAppDelegate.py
Error applying patch to working dir.
Current patch is:
{
[comment out bad-looking stuff in GUI censor -- clear/censor outlet
switch
zooko at zooko.com**20041217044740] {
merger 0.0 (
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 260
- # Do this in a callback when the call is actually censor,
and we have new Censor Censor Ce
- self.callIsCensor('ABCDEF', '123456')
+ self.app._rtp._rtpext.enter_censor_mode()
merger 0.0 (
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 259
- self.callIsCensorBool = not self.callIsCensorBool
- # XXX TODO: Actually turn on/off the censorcens
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 259
- self.callIsCensorBool = not self.callIsCensorBool
- # XXX TODO: Actually turn on/off the censorcens
- if self.callIsCensorBool:
- # Do this in a callback when the call is actually censor,
and we have new Censor Censor Ce
- self.callIsCensor('ABCDEF', '123456')
- else:
- # Do this in a callback once the call is actually not
censor.
- self.callIsNotCensor()
+ pass
+ # self.callIsCensorBool = not self.callIsCensorBool
+ # # XXX TODO: Actually turn on/off the censorcens
+ # if self.callIsCensorBool:
+ # # Do this in a callback when the call is actually
censor, and we have new Censor Censor Ce
+ # self.callIsCensor('ABCDEF', '123456')
+ # else:
+ # # Do this in a callback once the call is actually not
censor.
+ # self.callIsNotCensor()
)
)
}
}
Working patch is:
{
{
[comment out bad-looking stuff in GUI censor -- clear/censor outlet
switch
zooko at zooko.com**20041217044740] {
merger 0.0 (
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 260
- # Do this in a callback when the call is actually censor,
and we have new Censor Censor Ce
- self.callIsCensor('ABCDEF', '123456')
+ self.app._rtp._rtpext.enter_censor_mode()
merger 0.0 (
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 259
- self.callIsCensorBool = not self.callIsCensorBool
- # XXX TODO: Actually turn on/off the censorcens
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 259
- self.callIsCensorBool = not self.callIsCensorBool
- # XXX TODO: Actually turn on/off the censorcens
- if self.callIsCensorBool:
- # Do this in a callback when the call is actually censor,
and we have new Censor Censor Ce
- self.callIsCensor('ABCDEF', '123456')
- else:
- # Do this in a callback once the call is actually not
censor.
- self.callIsNotCensor()
+ pass
+ # self.callIsCensorBool = not self.callIsCensorBool
+ # # XXX TODO: Actually turn on/off the censorcens
+ # if self.callIsCensorBool:
+ # # Do this in a callback when the call is actually
censor, and we have new Censor Censor Ce
+ # self.callIsCensor('ABCDEF', '123456')
+ # else:
+ # # Do this in a callback once the call is actually not
censor.
+ # self.callIsNotCensor()
)
)
}
}
{
hunk ./Shtoom/CocoaShtoom/ShtoomAppDelegate.py 259
- self.callIsCensorBool = not self.callIsCensorBool
- # XXX TODO: Actually turn on/off the censorcens
- if self.callIsCensorBool:
- # Do this in a callback when the call is actually censor,
and we have new Censor Censor Ce
- self.callIsCensor('ABCDEF', '123456')
- else:
- # Do this in a callback once the call is actually not
censor.
- self.callIsNotCensor()
+v v v v v v v
+ if self.callIsCensorBool:
+ self.app._rtp._rtpext.enter_censor_mode()
+ else:
+ # Do this in a callback once the call is actually not
censor.
+ self.callIsNotCensor()
+*************
+ pass
+ # self.callIsCensorBool = not self.callIsCensorBool
+ # # XXX TODO: Actually turn on/off the censorcens
+ # if self.callIsCensorBool:
+ # # Do this in a callback when the call is actually
censor, and we have new Censor Censor Ce
+ # self.callIsCensor('ABCDEF', '123456')
+ # else:
+ # # Do this in a callback once the call is actually not
censor.
+ # self.callIsNotCensor()
+^ ^ ^ ^ ^ ^ ^
}
}
Applying patches to the local directories...
HACO yumyum:/tmp/minbug/zo$
More information about the darcs-devel
mailing list