This fixes a silent bug in a tests shellscript, where a sed would not
erase the conflict markers. I am using Ubuntu Linux 10.10 with GNU
sed version 4.2.1. I have grepped the other tests to look for similar
regexpes, but no other occurence of grep or sed do this kind of treatment
on conflict markers.

Note also that Ganesh's recent patch to add the previous text in conflict
marking will make a line of ===== remain after the current version of this
patch, so the alternative = will have to be added to the sed regexp.
1 patch for repository http://darcs.net:

Sat Oct  9 12:16:52 CEST 2010  Guillaume Hoffmann <guillaumh@gmail.com>
  * fix a sed regexp in hidden_conflicts2.sh

Attachments

• fix-a-sed-regexp-in-hidden_conflicts2_sh.dpatch
• unnamed

Another remark: hidden_conflicts2.sh passes also with --hashed
repositories (darcs1 patch type). So maybe this test is just useless
and should be removed.
hidden_conflicts.sh does fail with --hashed repos, on the other hand.

Guillaume

2010/10/9 gh <bugs@darcs.net>:
>
> New submission from gh <guillaumh@gmail.com>:
>
> This fixes a silent bug in a tests shellscript, where a sed would not
> erase the conflict markers. I am using Ubuntu Linux 10.10 with GNU
> sed version 4.2.1. I have grepped the other tests to look for similar
> regexpes, but no other occurence of grep or sed do this kind of treatment
> on conflict markers.
>
> Note also that Ganesh's recent patch to add the previous text in conflict
> marking will make a line of ===== remain after the current version of this
> patch, so the alternative = will have to be added to the sed regexp.
> 1 patch for repository http://darcs.net:
>
> Sat Oct  9 12:16:52 CEST 2010  Guillaume Hoffmann <guillaumh@gmail.com>
>  * fix a sed regexp in hidden_conflicts2.sh
>
> ----------
> files: fix-a-sed-regexp-in-hidden_conflicts2_sh.dpatch, unnamed
> messages: 12667
> nosy: gh
> status: needs-screening
> title: fix a sed regexp in hidden_conflicts2.sh
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/patch414>
> __________________________________

On Sat, Oct 09, 2010 at 10:27:02AM +0000, gh wrote:
> Sat Oct  9 12:16:52 CEST 2010  Guillaume Hoffmann <guillaumh@gmail.com>
>   * fix a sed regexp in hidden_conflicts2.sh

Wouldn't it be better to just use three `-e ...' args, i.e. 

	sed -e '/pattern1/d' -e '/pattern2/d' -e '/pattern3/d'

instead of

	sed -e '/pattern1\|pattern2\|pattern3/d'

It's more blurb, but you don't have to care wether sed uses basic
or extende regexps by default.

Ciao,
	Kili

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/screened.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_screened.html#bundle-599045917309b7e0d139260ef04b646caa5d53cd

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-599045917309b7e0d139260ef04b646caa5d53cd

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-599045917309b7e0d139260ef04b646caa5d53cd