[darcs-devel] [darcs #101] Fail: bug in darcs! Problem resolving conflicts in resolve!

zooko at zooko.com via RT bugs at darcs.net
Mon Nov 29 08:22:42 PST 2004


Mon Nov 29 11:22:41 2004: New ticket: 101.
Transaction: Ticket created by zooko at zooko.com
       Queue: Darcs
     Subject: Fail: bug in darcs!  Problem resolving conflicts in resolve! 
       Owner: Nobody
  Requestors: zooko at zooko.com
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=101 >

Same misbehavior from darcs 1.0.0 and 1.0.1pre1.

Here is a transcript:

HACL draco:~/playground/zfone$ darcs whatsnew
No changes!
HACL draco:~/playground/zfone$ darcs check
The repo is consistent!
HACL draco:~/playground/zfone$ darcs resolve
Finished resolving.
HACL draco:~/playground/zfone$ darcs resolve
This will trash any unrecorded changes in the working directory.
Are you sure?  [yn] y

Fail: bug in darcs!
Problem resolving conflicts in resolve!
Please report this to bugs at darcs.net
HACL draco:~/playground/zfone$ cd ..
HACL draco:~/playground$ time tar cf zfone-darcs-bug.tar zfone

real    1m20.939s
user    0m0.240s
sys     0m3.030s
HACL draco:~/playground$ darcs --version
1.0.1pre1
HACL draco:~/playground$ time bzip2 -9 zfone-darcs-bug.tar

real    1m46.975s
user    1m33.110s
sys     0m2.200s
HACL draco:~/playground$ time scp zfone-darcs-bug.tar.bz2 
TOPSECRETURLFORDAVIDSEYESONLY
zfone-darcs-bug.tar.bz2                                                 
                                                              100%   
26MB  33.2KB/s   09:35

real    9m42.144s
user    0m1.960s
sys     0m1.280s
HACL draco:~/playground$ darcs --version
1.0.0
HACL draco:~/playground$ cd zfone
HACL draco:~/playground/zfone$ darcs whatsnew
{
binary ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode/project.pbxproj
rmfile ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode/project.pbxproj
rmdir ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode
binary ./Shtoom/trunk/CocoaShtoom/Info.plist
rmfile ./Shtoom/trunk/CocoaShtoom/Info.plist
hunk ./Shtoom/trunk/CocoaShtoom/__main__.py 1
-#
-#  __main__.py
-#  Shtoom
-#
-#  Created by Donovan Preston on Tue Mar 23 2004.
-#  Copyright (c) 2004 __MyCompanyName__. All rights reserved.
-#
-
-import twisted.internet.cfreactor
-reactor = twisted.internet.cfreactor.install()
-
-import sys
-
-from twisted.python import log
-log.startLogging(sys.stdout)
-
-from PyObjCTools import AppHelper
-from Foundation import NSProcessInfo
-
-# import classes required to start application
-import ShtoomAppDelegate
-
-# start the event loop
-sys.argv = ['shtoom']
-AppHelper.runEventLoop(argv=[])
rmfile ./Shtoom/trunk/CocoaShtoom/__main__.py
}
HACL draco:~/playground/zfone$ darcs revert
binary ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode/project.pbxproj
Shall I revert this patch? (1/7) [ynWsfqadjk?] y
binary ./Shtoom/trunk/CocoaShtoom/Info.plist
Shall I revert this patch? (4/7) [ynWsfqadjk?] y
hunk ./Shtoom/trunk/CocoaShtoom/__main__.py 1
-#
-#  __main__.py
-#  Shtoom
-#
-#  Created by Donovan Preston on Tue Mar 23 2004.
-#  Copyright (c) 2004 __MyCompanyName__. All rights reserved.
-#
-
-import twisted.internet.cfreactor
-reactor = twisted.internet.cfreactor.install()
-
-import sys
-
-from twisted.python import log
-log.startLogging(sys.stdout)
-
-from PyObjCTools import AppHelper
-from Foundation import NSProcessInfo
-
-# import classes required to start application
-import ShtoomAppDelegate
-
-# start the event loop
-sys.argv = ['shtoom']
-AppHelper.runEventLoop(argv=[])
Shall I revert this patch? (6/7) [ynWsfqadjk?] y
Do you really want to do this? yes
Finished reverting.
HACL draco:~/playground/zfone$ darcs whatsnew
No changes!
HACL draco:~/playground/zfone$ darcs check
The repo is consistent!
HACL draco:~/playground/zfone$ darcs resolve
Finished resolving.
HACL draco:~/playground/zfone$ darcs resolve
This could trash your data.  Are you sure?  [yn] y

Fail: bug in darcs!
Problem resolving conflicts in resolve!
Please report this to bugs at darcs.net
HACL draco:~/playground/zfone$ darcs whatsnew
{
binary ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode/project.pbxproj
rmfile ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode/project.pbxproj
rmdir ./Shtoom/trunk/CocoaShtoom/Shtoom.xcode
binary ./Shtoom/trunk/CocoaShtoom/Info.plist
rmfile ./Shtoom/trunk/CocoaShtoom/Info.plist
hunk ./Shtoom/trunk/CocoaShtoom/__main__.py 1
-#
-#  __main__.py
-#  Shtoom
-#
-#  Created by Donovan Preston on Tue Mar 23 2004.
-#  Copyright (c) 2004 __MyCompanyName__. All rights reserved.
-#
-
-import twisted.internet.cfreactor
-reactor = twisted.internet.cfreactor.install()
-
-import sys
-
-from twisted.python import log
-log.startLogging(sys.stdout)
-
-from PyObjCTools import AppHelper
-from Foundation import NSProcessInfo
-
-# import classes required to start application
-import ShtoomAppDelegate
-
-# start the event loop
-sys.argv = ['shtoom']
-AppHelper.runEventLoop(argv=[])
rmfile ./Shtoom/trunk/CocoaShtoom/__main__.py
}






More information about the darcs-devel mailing list