Inspired by Benjamin Franksen's mail...
Also: I thought in darcs2 a patch followed by its inverse does not conflict
with anything?
Fri Jun 6 16:15:34 BST 2008 Eric Kow <[EMAIL PROTECTED]>
* Demonstrate 'hidden conflicts' bug (old format).
New patches:
[Demonstrate 'hidden conflicts' bug (old format).
Eric Kow <[EMAIL PROTECTED]>**20080606151534] addfile ./bugs/hidden-conflict.sh
hunk ./bugs/hidden-conflict.sh 1
+#!/bin/sh
+
+set -ev
+
+rm -rf temp1 temp2
+mkdir temp1
+cd temp1
+darcs init
+echo first > a
+darcs add a
+darcs record -am 'first'
+cd ..
+darcs get temp1 temp2
+
+cd temp1
+echo second > a
+darcs record -am 'first to second'
+echo first > a
+darcs record -am 'second back to first'
+cd ..
+
+cd temp2
+echo third > a
+darcs record -am 'first to third'
+cd ..
+
+cd temp1
+darcs pull -a ../temp2 | grep conflict
+grep third a
+cd ..
+
+rm -rf temp1 temp2
Context:
[fix regression introduced by using Data.List.isInfixOf.
David Roundy <[EMAIL PROTECTED]>**20080606102519]
[fix bug in test when there's a space in test directory.
David Roundy <[EMAIL PROTECTED]>**20080605151104]
[translate pull.pl into shell.
David Roundy <[EMAIL PROTECTED]>**20080605124106]
[make test suite smarter about cleaning up test directories.
David Roundy <[EMAIL PROTECTED]>**20080605124025]
[darcs put now support --{no-,}set-default.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080604214551]
[fix regression in index.html.in.
David Roundy <[EMAIL PROTECTED]>**20080605114356]
[resolve issue783: propose 'edit' as a default Windows editor
Eric Kow <[EMAIL PROTECTED]>**20080605165812
I think every Windows box has this. Advantages over notepad are that
- it's a console app
- it appears to support Unix newlines
]
[Makefile: prefix -optl only on $(LIBS) that start with '-'
Eric Kow <[EMAIL PROTECTED]>**20080605105539
Otherwise, on Windows, if you try to build --with-static-libs, the
linker will be passed /usr/local/lib/libcurl.a as an argument, which
makes gcc complain.
]
[resolve issue770: catch 'does not exist' when running external programs
Eric Kow <[EMAIL PROTECTED]>**20080604143100
Convert these errors into ExitCode 127 (for Windows)
]
[TAG 2.0.1rc1
David Roundy <[EMAIL PROTECTED]>**20080603124331]
Patch bundle hash:
89300372becc763263c8a788cae64d3289252128
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
