1 patch for repository http://darcs.net:

Sun Apr 18 13:36:27 BST 2010  Dave Love <fx@gnu.org>
  * Accept issue1819: pull --dont-allow-conflicts doesn't work

Attachments

• accept-issue1819_-pull-__dont_allow_conflicts-doesn_t-work.dpatch
• unnamed

Hi Trent, if I may add this to your pile :-)...

Hi Dave,

Sorry for the delay!  One minor comment is that the file should be named
failing-issue1819-pull-dont-allow-conflicts.sh

Now I'd just accept and fix this myself but I have a dumb shell question
to ask first.  Feel free to amend your way out of this.

Accept issue1819: pull --dont-allow-conflicts doesn't work
----------------------------------------------------------
> +#!/usr/bin/env bash
> +## Test for issue1819 - pull --dont-allow-conflicts doesn't work
> +##
> +## Dave Love <fx@gnu.org>, Public domain

Public domain works too indeed :-)

> +rm -rf R S
> +for repo in R S; do
> +    darcs init --repo $repo
> +    cd $repo
> +    echo 'Example content.' >x
> +    darcs add x
> +    darcs record -lam 'Add x'
> +    echo $repo >x
> +    darcs record -lam 'Change x'
> +    cd ..
> +done

> +cd S
> +echo |
> +  darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R &&
> +  exit 1 || true

I confess I'm a bit confused this... how do the newlines interact with
the pipe and the &&?

Is there a simpler way this could be expressed, perhaps with 'not'?

> +rm -rf R S

I imagine there's a cd.. missing above here?

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9

I should get this unstuck by studying this myself and following up

Just a little back-up.. I tried this too and agree with you about the last few lines, I couldn't convince myself they 
are correct. This was easier for me to understand:

cd S
echo | darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R || exit 1
cd ..
rm -rf R S

But when you rename the script to failing-... perhaps it'll be just:

cd S
echo | darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R

Applied at last! Sorry for the delay.  Took me a while to understand what 
the script was trying to do.  Have pushed with a followup patch to make 
use of the test lib for extra ease.  Thanks!

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-cff8afed5208aea44447cbae3c2e98f7420a9151

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-cff8afed5208aea44447cbae3c2e98f7420a9151