Hi all,

    I set up two repositories yesterday, to play a little with Darcs and try
to understand how the conflict system worked. I'm sending attached both
repositories, for reference (I guess they'll be helpful). If I can provide
more information or help in anything, just tell me.

    The last command output (and version, at the end) was:

------------------------------------- 8< -------------------------------------
zoso@hunter:~/tmp/darcs/hello-world-branch$ darcs pull
Pulling from "/home/zoso/tmp/darcs/hello-world-mainline"...

Thu Apr 13 13:53:09 WEST 2006  zoso@foton.es
  * Remove bloat
Shall I pull this patch? (1/1) [ynWvpxqadjk], or ? for help: y
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
hunk ./hello.rb 3
-puts "New sensation"
+puts "New sensation, new sensation"
merger 0.0 (
hunk ./hello.rb 7
+class Test
+    def initialize
+        @foo = :bar
+    end
+end
+
merger 0.0 (
hunk ./hello.rb 5
+puts "Another, important phrase"
+
merger 0.0 (
hunk ./hello.rb 3
-puts "Another brick in the Wall"
+puts "New sensation"
merger 0.0 (
hunk ./hello.rb 3
+puts "Another brick in the Wall"
+
hunk ./hello.rb 3
+puts "You're just another thing'"
+
)
)
)
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
)
hunk ./hello.rb 3
-puts "Hello, World!"
+puts "Hello, World, Once more!"
)
hunk ./hello.rb 1
-puts "Hello, World!"
+#!/usr/bin/ruby -w
+
+puts "Hello, World, again!"
)
merger 0.0 (
merger 0.0 (
hunk ./hello.rb 3
-puts "Hello, World!"
+puts "Hello, World, Once more!"
merger 0.0 (
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
)
)
hunk ./hello.rb 2
+
+require 'nsbb'
)
)
hunk ./hello.rb 1
-puts "Hello, World!"
+#!/usr/bin/ruby -w
+
+puts "Hello, World, again!"
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./hello.rb 3
-puts "Hello, World!"
+puts "Hello, World, Once more!"
merger 0.0 (
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
)
)
hunk ./hello.rb 2
+
+require 'nsbb'
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
)
hunk ./hello.rb 3
-puts "Hello, World!"
+puts "Hello, World, Once more!"
)
hunk ./hello.rb 1
-puts "Hello, World!"
+#!/usr/bin/ruby -w
+
+puts "Hello, World, again!"
)
)
merger 0.0 (
merger 0.0 (
hunk ./hello.rb 2
+
+require 'nsbb'
merger 0.0 (
hunk ./hello.rb 3
-puts "Hello, World!"
+puts "Hello, World, Once more!"
merger 0.0 (
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
hunk ./hello.rb 1
+#!/usr/bin/ruby -w
+
)
)
)
hunk ./hello.rb 4
-
-puts "Hello, World, Once more!"
-
-puts "New sensation, new sensation"
-
-puts "Another, important phrase"
)
)
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.
zoso@hunter:~/tmp/darcs/hello-world-branch$ darcs --exact-version
darcs compiled on Jan 15 2006, at 11:05:33
unknown
zoso@hunter:~$ darcs --version
1.0.5 (release)
------------------------------------- >8 -------------------------------------

It's the current Debian package for Sid, BTW (1.0.5-3).

    FWIW, I just checked with
http://www.carpetcode.org/binaries/darcs-1.0.6-static-linux-i386.gz (linked
from http://www.carpetcode.org/get-carpet-darcs.html#darcs), and the result is
the same, apparently:

------------------------------------- 8< -------------------------------------
zoso@hunter:~/tmp/darcs/hello-world-branch$ ~/tmp/darcs-1.0.6-static-linux-i386 --exact-version
darcs compiled on Mar  1 2006, at 03:01:57
# configured Wed Mar  1 02:53:45 CET 2006
./configure --prefix=/afs/aei-potsdam.mpg.de/u/eschnett LDFLAGS=-static --no-create --no-recursion

Context:

[bump version to 1.0.7pre1
Tommy Pettersson <ptp@lysator.liu.se>**20060301000323]

[show 1.0.6 as latest stable source on web page
Tommy Pettersson <ptp@lysator.liu.se>**20060301000158
 Forgot this, again :-/
]

[TAG 1.0.6
Tommy Pettersson <ptp@lysator.liu.se>**20060228111841]
------------------------------------- >8 -------------------------------------

Regards,

Merging into issue194.  Thanks for the report!

This bug is a duplicate one that is resolved-in-unstable.